refill all the tests

40 files changed, 1800 insertions, 6369 deletions

diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
index cea3567b5..8fd8bce24 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
@@ -2,8 +2,10 @@
     "Call1024BalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x922d67579dd5eb289dc25d121867bf210ed4e116a551d04dfae30170b352358d",
-                    "mixHash" : "0xbdd2698ae83282f0e4ccc6849ae70d54f0dfad609c673ceb7356f9aade082e91",
-                    "nonce" : "0x7a2af024375b4734",
+                    "hash" : "0x7aac122385e2fadea67785564c629a24d61068411f1a48fe8e5d3a1007fc1d35",
+                    "mixHash" : "0x97970dfb05761197d2e840d49c15980a48af6f1f92d3c4d9351ae48240373700",
+                    "nonce" : "0x71c163a95828e486",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0bdd2698ae83282f0e4ccc6849ae70d54f0dfad609c673ceb7356f9aade082e91887a2af024375b4734f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a097970dfb05761197d2e840d49c15980a48af6f1f92d3c4d9351ae482403737008871c163a95828e486f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x922d67579dd5eb289dc25d121867bf210ed4e116a551d04dfae30170b352358d",
+        "lastblockhash" : "0x7aac122385e2fadea67785564c629a24d61068411f1a48fe8e5d3a1007fc1d35",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "Call1024BalanceTooLow_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xabc5ed",
-                    "hash" : "0x27fd88feae1b52bf9614d3e4aa0ea81273bb34bc23269cfec20bc42462fcff6f",
-                    "mixHash" : "0x8de443b5a353e23735f5a103337cbac68d8be6f2b98cb86ce710b07f6c674cfe",
-                    "nonce" : "0x7c3cee363aeb0c5d",
-                    "number" : "0x01",
-                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
-                    "stateRoot" : "0x5187d67bcc898514462b2f8637b92e1f2cd1f79e43600fd2ce785a05aea5c184",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba05187d67bcc898514462b2f8637b92e1f2cd1f79e43600fd2ce785a05aea5c184a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a08de443b5a353e23735f5a103337cbac68d8be6f2b98cb86ce710b07f6c674cfe887c3cee363aeb0c5df865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "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" : "0x27fd88feae1b52bf9614d3e4aa0ea81273bb34bc23269cfec20bc42462fcff6f",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x29a2241af6d7c5ed",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x96ea48f7a02b4ba9210c170a019e1e6e44c756d2b9f902b7c1362811ca955621",
-                    "mixHash" : "0xc81542728861e734b32c84a8a8899c260da482790e87d459b872e65d88e962e3",
-                    "nonce" : "0x96a007e294d8c9f7",
+                    "hash" : "0x62b338d8e7e68337f7b58e7c1d1906f1d33d916509fa04014d2483c28c99b5ff",
+                    "mixHash" : "0xf21c0448e6384d8f87854d4a0dad219f7ef8cd85914dd4fe046f800e7124e12a",
+                    "nonce" : "0xc17820bb248f46c4",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0c81542728861e734b32c84a8a8899c260da482790e87d459b872e65d88e962e38896a007e294d8c9f7f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0f21c0448e6384d8f87854d4a0dad219f7ef8cd85914dd4fe046f800e7124e12a88c17820bb248f46c4f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x96ea48f7a02b4ba9210c170a019e1e6e44c756d2b9f902b7c1362811ca955621",
+        "lastblockhash" : "0x62b338d8e7e68337f7b58e7c1d1906f1d33d916509fa04014d2483c28c99b5ff",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -372,8 +248,10 @@
     "Call1024BalanceTooLow_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x105db9bfe56b6785d1e4cddf9e981d0919c43a7a762bf062f804ec79b8c3a899",
-                    "mixHash" : "0xf2fa7f49d01a27842a5785efea0fdeb23b7466c69252e811fdda814da6109b27",
-                    "nonce" : "0x9b973f8eba48582c",
+                    "hash" : "0x4a1ccb160286443ec3ace584e6318e24329b04d084d8ca4c21e5a446afa58495",
+                    "mixHash" : "0x9961a9fee4ae28ce54d84b95b37ea0406039fe909add70d7b9e4e48492cb6421",
+                    "nonce" : "0xa8c7276c6a5d346c",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0f2fa7f49d01a27842a5785efea0fdeb23b7466c69252e811fdda814da6109b27889b973f8eba48582cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a09961a9fee4ae28ce54d84b95b37ea0406039fe909add70d7b9e4e48492cb642188a8c7276c6a5d346cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x105db9bfe56b6785d1e4cddf9e981d0919c43a7a762bf062f804ec79b8c3a899",
+        "lastblockhash" : "0x4a1ccb160286443ec3ace584e6318e24329b04d084d8ca4c21e5a446afa58495",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -493,8 +371,10 @@
     "Call1024BalanceTooLow_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d788",
-                    "hash" : "0xc70859440a18d03a9a459151cc049de31ee8dcab40c2f2079b02fc2cea1d4984",
-                    "mixHash" : "0x7645496e08110f085f558a2b3d38f0e92241903d8f9459ae4871950b664fa4cc",
-                    "nonce" : "0x23f92a2b4ab3b4f8",
+                    "hash" : "0x9ae413529ba7f0dde85bb02c567d81462890338cbbb2d5e700b6c7c45f9f08f7",
+                    "mixHash" : "0xa784d5e6cb0c18a173cfcb8271234070955fe8d5b58fdbb50d0d3a2401e9295a",
+                    "nonce" : "0x33d1042130f4ad35",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x1c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acf",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a07645496e08110f085f558a2b3d38f0e92241903d8f9459ae4871950b664fa4cc8823f92a2b4ab3b4f8f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a0a784d5e6cb0c18a173cfcb8271234070955fe8d5b58fdbb50d0d3a2401e9295a8833d1042130f4ad35f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc70859440a18d03a9a459151cc049de31ee8dcab40c2f2079b02fc2cea1d4984",
+        "lastblockhash" : "0x9ae413529ba7f0dde85bb02c567d81462890338cbbb2d5e700b6c7c45f9f08f7",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -612,8 +492,10 @@
     "Call1024BalanceTooLow_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000b42a",
-                    "hash" : "0x13217accb6265882c23dfdeb1342344a0c755407f72ea6a60c9ce51fd40cf278",
-                    "mixHash" : "0x61ebde13151411c4d623880c5110cebc67da233785b2f9aca602f9d5f74ba63d",
-                    "nonce" : "0xde1736f6670aa380",
+                    "hash" : "0x4ba4a73831db4e80cea45e29f16d878daebc185d474dd85398be8a7036566609",
+                    "mixHash" : "0x44ce72773b54a2b4b44c35a0f47c0c6e04a5720dab606b5baa50f4df9d33b9d5",
+                    "nonce" : "0x79b2f795dee2f575",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a061ebde13151411c4d623880c5110cebc67da233785b2f9aca602f9d5f74ba63d88de1736f6670aa380f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a044ce72773b54a2b4b44c35a0f47c0c6e04a5720dab606b5baa50f4df9d33b9d58879b2f795dee2f575f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13217accb6265882c23dfdeb1342344a0c755407f72ea6a60c9ce51fd40cf278",
+        "lastblockhash" : "0x4ba4a73831db4e80cea45e29f16d878daebc185d474dd85398be8a7036566609",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
index f17f28eaa..d0e8a62b1 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
@@ -2,8 +2,10 @@
     "Call1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x50ceda3d90a1de3a3309ffa887e857dc5d1af1dda3815c0e8bfed0212d411fff",
-                    "mixHash" : "0x42c6b8713798a0031d49852bd7fa15fe96ac1f732c6a046cc50dab9ca9f5f1fc",
-                    "nonce" : "0x00cdfe4d747c3f91",
+                    "hash" : "0x468d6c14a0c91a95e274bdea593d002ac1fc26c203604ea8fdb810029d897dfa",
+                    "mixHash" : "0x8ead4f9b91255a12b9566f6407a959fc6c56c37fb94e0dfeb8fb1fb9244a7451",
+                    "nonce" : "0x68388bf2762bc59d",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a042c6b8713798a0031d49852bd7fa15fe96ac1f732c6a046cc50dab9ca9f5f1fc8800cdfe4d747c3f91f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a08ead4f9b91255a12b9566f6407a959fc6c56c37fb94e0dfeb8fb1fb9244a74518868388bf2762bc59df862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50ceda3d90a1de3a3309ffa887e857dc5d1af1dda3815c0e8bfed0212d411fff",
+        "lastblockhash" : "0x468d6c14a0c91a95e274bdea593d002ac1fc26c203604ea8fdb810029d897dfa",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -121,140 +123,13 @@
             }
         }
     },
-    "Call1024OOG_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8720",
-                    "hash" : "0x82dfadf7d0403253fd2a61c42a36dc67bcf43718b94ed968bc8de4ea4dedfcbb",
-                    "mixHash" : "0x7d24827c53c1a5829ca8e93cee17074c8a7afbd44dea86e7b73d798b82476cf4",
-                    "nonce" : "0x0538370d52f324fc",
-                    "number" : "0x01",
-                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
-                    "stateRoot" : "0xa5f2fccb584183d2beb54afc46ee0a58a4817c526dcddf3b72e65900c5bfdc33",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a5f2fccb584183d2beb54afc46ee0a58a4817c526dcddf3b72e65900c5bfdc33a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a07d24827c53c1a5829ca8e93cee17074c8a7afbd44dea86e7b73d798b82476cf4880538370d52f324fcf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "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" : "0x82dfadf7d0403253fd2a61c42a36dc67bcf43718b94ed968bc8de4ea4dedfcbb",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x29a2241af6668720",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -265,9 +140,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0xfc17c4b47b7de5aa5744ef18b08a696c7f19a01d77f3771481cedc33e493563a",
-                    "mixHash" : "0xa0733d8229fb6267dd3c4573d04d737e099882a1b752c1f83afce7fa0fd09236",
-                    "nonce" : "0xd0fff3e8db60592c",
+                    "hash" : "0x4cb5f6a27bcd644ae0a65d6ffe939a2f1c2370c6cf5010a9aa5e595d6e91864c",
+                    "mixHash" : "0x02e3c231fd35474bfc59e52d6feaa9e6305fa688a6ea4befdbd2bc1a7f9d5a50",
+                    "nonce" : "0x29990fd01b2045e4",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -276,7 +151,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0a0733d8229fb6267dd3c4573d04d737e099882a1b752c1f83afce7fa0fd0923688d0fff3e8db60592cf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a002e3c231fd35474bfc59e52d6feaa9e6305fa688a6ea4befdbd2bc1a7f9d5a508829990fd01b2045e4f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -313,7 +188,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc17c4b47b7de5aa5744ef18b08a696c7f19a01d77f3771481cedc33e493563a",
+        "lastblockhash" : "0x4cb5f6a27bcd644ae0a65d6ffe939a2f1c2370c6cf5010a9aa5e595d6e91864c",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -375,8 +250,10 @@
     "Call1024OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -387,9 +264,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x62c090b5735172a99145e9aefef62c5f1886c9745ed6c027ba4b781170ac7cc4",
-                    "mixHash" : "0xfeb0637d8c203888aad75be29ddf33eeebd5a7804b9dccdb97ee650bd11151e2",
-                    "nonce" : "0xc98d184b64121428",
+                    "hash" : "0x22d4d1f289be7d35452da4ab895433ff2105e6ffcb72b951c816a9a9e2eda632",
+                    "mixHash" : "0x72d9a56dddd39753977a1f8c2b07d395059fa406cf536c329665bdd5f5bc50f7",
+                    "nonce" : "0xd40383f191bf3dcc",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -398,7 +275,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0feb0637d8c203888aad75be29ddf33eeebd5a7804b9dccdb97ee650bd11151e288c98d184b64121428f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a072d9a56dddd39753977a1f8c2b07d395059fa406cf536c329665bdd5f5bc50f788d40383f191bf3dccf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -435,7 +312,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62c090b5735172a99145e9aefef62c5f1886c9745ed6c027ba4b781170ac7cc4",
+        "lastblockhash" : "0x22d4d1f289be7d35452da4ab895433ff2105e6ffcb72b951c816a9a9e2eda632",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -497,8 +374,10 @@
     "Call1024OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -509,9 +388,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefe17a",
-                    "hash" : "0x4b43c86a1a05167c520f511429312a15a14eb6e2710fbc5be26e807963d8f1c4",
-                    "mixHash" : "0x71b31ebc5491583427279c6fa105449447d0e999590cda95049a3bd623d5050b",
-                    "nonce" : "0x486ac8e7b4679359",
+                    "hash" : "0x29948a55effb838618f9dc08b99b8e951c49a1cd85236650a4ee397ba94f1079",
+                    "mixHash" : "0xb49afa0cea7126769c247d2e0063a8d03bc73aa64824ccef194bd313a998a940",
+                    "nonce" : "0xa79d9530ca1975f2",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
@@ -520,7 +399,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a071b31ebc5491583427279c6fa105449447d0e999590cda95049a3bd623d5050b88486ac8e7b4679359f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0b49afa0cea7126769c247d2e0063a8d03bc73aa64824ccef194bd313a998a94088a79d9530ca1975f2f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -557,7 +436,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b43c86a1a05167c520f511429312a15a14eb6e2710fbc5be26e807963d8f1c4",
+        "lastblockhash" : "0x29948a55effb838618f9dc08b99b8e951c49a1cd85236650a4ee397ba94f1079",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -616,8 +495,10 @@
     "Call1024OOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -628,9 +509,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefd576",
-                    "hash" : "0xaa13077589fea1d47bcc4e0404e4d0e302ceb0d299be391c32814e2a8e94175e",
-                    "mixHash" : "0x9f1a20b688c70993aebc177679c73aff7fa1475f37d50e3ffc04be3722aa264c",
-                    "nonce" : "0xc3f7828c85d9a164",
+                    "hash" : "0x8da48a165e14a2ed92ede08d3c567b6c1ea8454b3c5fe851f4c739a5183aa079",
+                    "mixHash" : "0x4981011be75e5a5b08b4472cad549b2a09feeef79792278f21327628112b18a1",
+                    "nonce" : "0xfc2bd59f247f5a03",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
@@ -639,7 +520,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a09f1a20b688c70993aebc177679c73aff7fa1475f37d50e3ffc04be3722aa264c88c3f7828c85d9a164f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a04981011be75e5a5b08b4472cad549b2a09feeef79792278f21327628112b18a188fc2bd59f247f5a03f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -676,7 +557,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa13077589fea1d47bcc4e0404e4d0e302ceb0d299be391c32814e2a8e94175e",
+        "lastblockhash" : "0x8da48a165e14a2ed92ede08d3c567b6c1ea8454b3c5fe851f4c739a5183aa079",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
index 68444e15b..1fd364be6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
@@ -2,8 +2,10 @@
     "Call1024PreCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0x831e5c5dc75171ce5416dacceadd6e1d5bb9cd99681866d2f632dcb5cbf67ccf",
-                    "mixHash" : "0x3324837daa49e170c20c1e09e9a4742f2e3e60b97d5fa624bc93dd1ab5dc5e71",
-                    "nonce" : "0x97f4dfd332803204",
+                    "hash" : "0x22b2cb43b673de39bb1972105c314563710ebb234162d3d6b416d37ee4b44f1d",
+                    "mixHash" : "0x675e5261c9c00f09b012fe40501c2cbe4824c757f7de942b8c520f885124dfd9",
+                    "nonce" : "0x24e240f8ff7f20e6",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0946d5aff549116a10e4c18c76f0279a4223545c125578ac7281a26c48b3aaedaa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a03324837daa49e170c20c1e09e9a4742f2e3e60b97d5fa624bc93dd1ab5dc5e718897f4dfd332803204f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0946d5aff549116a10e4c18c76f0279a4223545c125578ac7281a26c48b3aaedaa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0675e5261c9c00f09b012fe40501c2cbe4824c757f7de942b8c520f885124dfd98824e240f8ff7f20e6f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x831e5c5dc75171ce5416dacceadd6e1d5bb9cd99681866d2f632dcb5cbf67ccf",
+        "lastblockhash" : "0x22b2cb43b673de39bb1972105c314563710ebb234162d3d6b416d37ee4b44f1d",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -122,141 +124,13 @@
             }
         }
     },
-    "Call1024PreCalls_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x022d79b7",
-                    "hash" : "0x609495e3b1f5f7f1d76ddb7c1377dbe1ea83eeab3cf38708480de817cfee2709",
-                    "mixHash" : "0xcf350fea79302435b6c404e865072b56c95870c0ff98066b2746fa1b0a7c7731",
-                    "nonce" : "0xcd4886d80b5fefd6",
-                    "number" : "0x01",
-                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
-                    "stateRoot" : "0xd2716b9e10282f775117e1d78fe57f5ea04fea81d08a093a08228874aa578961",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d2716b9e10282f775117e1d78fe57f5ea04fea81d08a093a08228874aa578961a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0cf350fea79302435b6c404e865072b56c95870c0ff98066b2746fa1b0a7c773188cd4886d80b5fefd6f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "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" : "0x609495e3b1f5f7f1d76ddb7c1377dbe1ea83eeab3cf38708480de817cfee2709",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2320",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x29a2241af85979b7",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -267,9 +141,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0x54a5789b00075c7a397a14d38a2409ddfae425b9e783fbce0804f2fef4124dcd",
-                    "mixHash" : "0x5cccf3aaa2d3c809b5775745991b0b58d3ddeaf4cb9e7b1e9c0216c8fd8216f6",
-                    "nonce" : "0x5ef3356967b98d8e",
+                    "hash" : "0x141b041c39b1f65ce33e9eb29833e46ae8d2c7dc4512e8c546809eabd5cfaca0",
+                    "mixHash" : "0xde8d5ccec4e051a8546fdc4a3d896536bd4897b487cd2736c1cc68a4c86e9061",
+                    "nonce" : "0x4d4b0f636c448824",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
@@ -278,7 +152,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a05cccf3aaa2d3c809b5775745991b0b58d3ddeaf4cb9e7b1e9c0216c8fd8216f6885ef3356967b98d8ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0de8d5ccec4e051a8546fdc4a3d896536bd4897b487cd2736c1cc68a4c86e9061884d4b0f636c448824f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -315,7 +189,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54a5789b00075c7a397a14d38a2409ddfae425b9e783fbce0804f2fef4124dcd",
+        "lastblockhash" : "0x141b041c39b1f65ce33e9eb29833e46ae8d2c7dc4512e8c546809eabd5cfaca0",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -378,8 +252,10 @@
     "Call1024PreCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -390,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0xde03f22e85dbece9c328ca01cbf32653345d7d7c12242819a36c069c992c21f1",
-                    "mixHash" : "0xe518f19ea6abb3c30da403167d5c3cbfd685d085219d73d13f58dc17fc555c99",
-                    "nonce" : "0x8e19e9f570020bf4",
+                    "hash" : "0xb087a72eb06f1ffab5aa60da78672894c72a69ced5bf24ee3bd9277ec58b67ea",
+                    "mixHash" : "0x478ad451666a594ac1eacc270dacd12bcdb6acd66ae522ea1ca439461d1000d5",
+                    "nonce" : "0x248fd2a5796f6d65",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
@@ -401,7 +277,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0e518f19ea6abb3c30da403167d5c3cbfd685d085219d73d13f58dc17fc555c99888e19e9f570020bf4f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0478ad451666a594ac1eacc270dacd12bcdb6acd66ae522ea1ca439461d1000d588248fd2a5796f6d65f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -438,7 +314,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde03f22e85dbece9c328ca01cbf32653345d7d7c12242819a36c069c992c21f1",
+        "lastblockhash" : "0xb087a72eb06f1ffab5aa60da78672894c72a69ced5bf24ee3bd9277ec58b67ea",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -501,8 +377,10 @@
     "Call1024PreCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -513,9 +391,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x67e327b3d705daf884b2fb6ad5ee6784d77612f1fbd75f631c62c61affc9dd0d",
-                    "mixHash" : "0xad4afb489c9d4c087c47668fde416f7342895a844f9a0d8bbf88f216febbce35",
-                    "nonce" : "0x6eaf57db90889453",
+                    "hash" : "0x33bb877cb5093fceb9241cd1da90c7ed4c63b669fd2814a608d69e7e72a12ae0",
+                    "mixHash" : "0x3d649c81fd2bff472fec8dafd7fc95892e62dbd1cef2e9b0b9e8fc5c2af699b5",
+                    "nonce" : "0x210b74f593040b52",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0x1d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362b",
@@ -524,7 +402,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0ad4afb489c9d4c087c47668fde416f7342895a844f9a0d8bbf88f216febbce35886eaf57db90889453f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a03d649c81fd2bff472fec8dafd7fc95892e62dbd1cef2e9b0b9e8fc5c2af699b588210b74f593040b52f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -561,7 +439,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67e327b3d705daf884b2fb6ad5ee6784d77612f1fbd75f631c62c61affc9dd0d",
+        "lastblockhash" : "0x33bb877cb5093fceb9241cd1da90c7ed4c63b669fd2814a608d69e7e72a12ae0",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -620,8 +498,10 @@
     "Call1024PreCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -632,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x100000018542",
-                    "hash" : "0xd3940f4b7747f114f21bbd65212991d21ea8d2e5c80a5f842df7a862976fd01a",
-                    "mixHash" : "0xc5f18a462ea575c042cc0f3b8650fca0bdb1172cb9d2f2404b0144847c99f473",
-                    "nonce" : "0xab6e7bc998a68dd2",
+                    "hash" : "0xb67435adc0b787309599994519577df97573f0635495d25e0c52dbfb1bc64ac0",
+                    "mixHash" : "0xd2b5108f53bb71a94f32e2e6f15381e9576e2d404a781bcafb03b150ff649042",
+                    "nonce" : "0x19eaea579935447e",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0x0e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034d",
@@ -643,7 +523,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a0c5f18a462ea575c042cc0f3b8650fca0bdb1172cb9d2f2404b0144847c99f47388ab6e7bc998a68dd2f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a0d2b5108f53bb71a94f32e2e6f15381e9576e2d404a781bcafb03b150ff6490428819eaea579935447ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -680,7 +560,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3940f4b7747f114f21bbd65212991d21ea8d2e5c80a5f842df7a862976fd01a",
+        "lastblockhash" : "0xb67435adc0b787309599994519577df97573f0635495d25e0c52dbfb1bc64ac0",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
index 5736c1c2b..8836655b7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
@@ -2,8 +2,10 @@
     "CallLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0xd10d92d08718f61bdf2f311248de91f4109810bb662e8daaf267803694948665",
-                    "mixHash" : "0x86a3dfa228daf7fb6d613460f4e31045f21f1eeb6681168c2396329f8d90e98e",
-                    "nonce" : "0x9132b75ee8a614e0",
+                    "hash" : "0x157b6ee2d87b7dcb172bfd5c78002b09603b3ef912c34eab47b1d106d5433b99",
+                    "mixHash" : "0xee7410deb5a209de95e9e1ff340c8161574adecc7890bf50f55fcabd70b4f4dc",
+                    "nonce" : "0xef1dea0d3cf9f15d",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f69e8ea6e0da5c9be3eb9fbde338cc1a7157774168d4fcf626aab764259fad5ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a086a3dfa228daf7fb6d613460f4e31045f21f1eeb6681168c2396329f8d90e98e889132b75ee8a614e0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f69e8ea6e0da5c9be3eb9fbde338cc1a7157774168d4fcf626aab764259fad5ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0ee7410deb5a209de95e9e1ff340c8161574adecc7890bf50f55fcabd70b4f4dc88ef1dea0d3cf9f15df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd10d92d08718f61bdf2f311248de91f4109810bb662e8daaf267803694948665",
+        "lastblockhash" : "0x157b6ee2d87b7dcb172bfd5c78002b09603b3ef912c34eab47b1d106d5433b99",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "CallLoseGasOOG_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028dc8",
-                    "hash" : "0x3bdbc20836a2cd49f91f38b8502bd5dd4e0b76244fd111ddbf225fee23f5e696",
-                    "mixHash" : "0xdabfaadde766ba3994aed912835d6a2094ddeb0e93214d06cc3fe40ad62d17cf",
-                    "nonce" : "0x2a4cb14fcde320aa",
-                    "number" : "0x01",
-                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
-                    "stateRoot" : "0xf5a12b009e98ef39484d17b142377a737d66ac0321808d6bb6fa5b76e99e318b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f5a12b009e98ef39484d17b142377a737d66ac0321808d6bb6fa5b76e99e318ba05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0dabfaadde766ba3994aed912835d6a2094ddeb0e93214d06cc3fe40ad62d17cf882a4cb14fcde320aaf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "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" : "0x3bdbc20836a2cd49f91f38b8502bd5dd4e0b76244fd111ddbf225fee23f5e696",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd722d",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x29a2241af62e8dc8",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0x6af8ad342e3e823c208516712c29fc95aca1e4886fb2ded0598aeadb10c22a4c",
-                    "mixHash" : "0xd42c469b42f27c976830d10679457c02333bba04a2b5d11187c29f3e26c2948d",
-                    "nonce" : "0x48da7c311f5d90d3",
+                    "hash" : "0x54792a3ffbd15533abfdd5108b70db934646389c4b65cefa5f2d3a0e6210aadf",
+                    "mixHash" : "0x1c9d6ba022e2dd7c6dd6ca90d6f42a9b93351f2a982950548e6019acbc832cc5",
+                    "nonce" : "0xee1cdf65f6138c35",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0d42c469b42f27c976830d10679457c02333bba04a2b5d11187c29f3e26c2948d8848da7c311f5d90d3f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a01c9d6ba022e2dd7c6dd6ca90d6f42a9b93351f2a982950548e6019acbc832cc588ee1cdf65f6138c35f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6af8ad342e3e823c208516712c29fc95aca1e4886fb2ded0598aeadb10c22a4c",
+        "lastblockhash" : "0x54792a3ffbd15533abfdd5108b70db934646389c4b65cefa5f2d3a0e6210aadf",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -372,8 +248,10 @@
     "CallLoseGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0x7174f48df74104f822867d42ab06a3824fa24a4f4b055a96dbef9c45ac178759",
-                    "mixHash" : "0xff29ae12ea61342532813e3cd0b91c645a92e99569b9143447a7c54c9806c2b3",
-                    "nonce" : "0x831104cedb5692bc",
+                    "hash" : "0x50c501b8932c0827343a7cebfc12c1e40d9c27ff45ba10e50e6e415d9218119c",
+                    "mixHash" : "0xe5117d97dfd01a5a8707fb534b6be8b07826a2fcbb386073b9ad588449f5ab03",
+                    "nonce" : "0x80e3825b917bec34",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0ff29ae12ea61342532813e3cd0b91c645a92e99569b9143447a7c54c9806c2b388831104cedb5692bcf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0e5117d97dfd01a5a8707fb534b6be8b07826a2fcbb386073b9ad588449f5ab038880e3825b917bec34f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7174f48df74104f822867d42ab06a3824fa24a4f4b055a96dbef9c45ac178759",
+        "lastblockhash" : "0x50c501b8932c0827343a7cebfc12c1e40d9c27ff45ba10e50e6e415d9218119c",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -493,8 +371,10 @@
     "CallLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0xcc50bd9841fd1155f4701f5ca4d2d422c3ef54ec43e09b1372a92ca781e1ae6e",
-                    "mixHash" : "0x36abd30d6fb13f4545ea4e0533e231ac33cba73a9fdca267d0c6e2a90dd331fd",
-                    "nonce" : "0xd024cbacbe3f4224",
+                    "hash" : "0x0f06498003f9d0e19b76043c68c7954a96ba0eb25c6a9289ebf09bac093fb8a0",
+                    "mixHash" : "0xeba528e4204fc79eef6b3ec11a130b193d55b7d6eb06d1bb18d4c114dab67ea3",
+                    "nonce" : "0xc5fa2a14073aef6e",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0xf139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a036abd30d6fb13f4545ea4e0533e231ac33cba73a9fdca267d0c6e2a90dd331fd88d024cbacbe3f4224f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0eba528e4204fc79eef6b3ec11a130b193d55b7d6eb06d1bb18d4c114dab67ea388c5fa2a14073aef6ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc50bd9841fd1155f4701f5ca4d2d422c3ef54ec43e09b1372a92ca781e1ae6e",
+        "lastblockhash" : "0x0f06498003f9d0e19b76043c68c7954a96ba0eb25c6a9289ebf09bac093fb8a0",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -612,8 +492,10 @@
     "CallLoseGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028972",
-                    "hash" : "0xa6cc3cbad0123e57e1af094df368678e0c51db165c9f66eb059f5d0349512c32",
-                    "mixHash" : "0xba341466cf6d1b692f6edae85f45036bb708fc3404bc34f2492907f960ee8d69",
-                    "nonce" : "0x2ac188861bf61fba",
+                    "hash" : "0xd23c470e96ab17c13f327a6d4cfacfd1e8be20e80537e514e298099d8cd282f6",
+                    "mixHash" : "0x66d04e6d5a3c71f50f17e00029117ec5d103f21500daf20857d7d12769216c00",
+                    "nonce" : "0x69b93e55d4558bbc",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0ba341466cf6d1b692f6edae85f45036bb708fc3404bc34f2492907f960ee8d69882ac188861bf61fbaf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a066d04e6d5a3c71f50f17e00029117ec5d103f21500daf20857d7d12769216c008869b93e55d4558bbcf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6cc3cbad0123e57e1af094df368678e0c51db165c9f66eb059f5d0349512c32",
+        "lastblockhash" : "0xd23c470e96ab17c13f327a6d4cfacfd1e8be20e80537e514e298099d8cd282f6",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
index f416036e2..a64475cfc 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
@@ -2,8 +2,10 @@
     "CallRecursiveBombPreCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0x6b4c5118f2655f51241433011a3ec8e37bf6ea572b9302de8e343fc6fd6dd8df",
-                    "mixHash" : "0x727544dd8617a12ee8c58a1d48fe73274a2501940c67fee7c570b1a12904989b",
-                    "nonce" : "0x12d47a4cff563fc2",
+                    "hash" : "0xac3569815f8a3583755c1d82d638d5bdb40fcf0d8d5f0ed4cba5b3d02cd9779b",
+                    "mixHash" : "0x8e4476b0d66a7b4877f6585f3d3121566772966298f3063592fffd5d3ab02325",
+                    "nonce" : "0xb395b4193114a9f3",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdcc751f7828f91757b04e3ab07248f2a94147ac2f7693828b5bd6a588395715a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0727544dd8617a12ee8c58a1d48fe73274a2501940c67fee7c570b1a12904989b8812d47a4cff563fc2f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdcc751f7828f91757b04e3ab07248f2a94147ac2f7693828b5bd6a588395715a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a08e4476b0d66a7b4877f6585f3d3121566772966298f3063592fffd5d3ab0232588b395b4193114a9f3f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b4c5118f2655f51241433011a3ec8e37bf6ea572b9302de8e343fc6fd6dd8df",
+        "lastblockhash" : "0xac3569815f8a3583755c1d82d638d5bdb40fcf0d8d5f0ed4cba5b3d02cd9779b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -129,148 +131,13 @@
             }
         }
     },
-    "CallRecursiveBombPreCall_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xacb1dd",
-                    "hash" : "0x3677908f12886ec0b49df44c712850cb5097e8c9082edd9915de3acd22543ce7",
-                    "mixHash" : "0x8dd50d34bb3705d21ddaadd2892cbf9c5ed2ce6b406db0ad1f52c2b2c062ccbf",
-                    "nonce" : "0x1c67c74a0fc18321",
-                    "number" : "0x01",
-                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
-                    "stateRoot" : "0xb378392cfb9285a1765ba0bd58131f45d74db7eef65bfc031602414aee438fa2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b378392cfb9285a1765ba0bd58131f45d74db7eef65bfc031602414aee438fa2a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a08dd50d34bb3705d21ddaadd2892cbf9c5ed2ce6b406db0ad1f52c2b2c062ccbf881c67c74a0fc18321f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
-                "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" : "0x3677908f12886ec0b49df44c712850cb5097e8c9082edd9915de3acd22543ce7",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffe8",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af6d8b1dd",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -281,9 +148,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0x78c0b22f9f4a79e57c05b0d9d1dc4f66373f9d974b7b31f5e3740395df305f07",
-                    "mixHash" : "0xf1a42c4f0019c60090f07d4a24d772586fd9afc2f307a86cd1f29183842387a1",
-                    "nonce" : "0x6d75bec52418fd0f",
+                    "hash" : "0x296de8529dbbdf4fff4cb209da7e841d1e7d782e88d4cc3433dfbe862da019ef",
+                    "mixHash" : "0x9775755ebfbc5cadb25a00f8f6fffcf63b31acf1732b0c1cf446fb887eee4cce",
+                    "nonce" : "0xf8b24facece3649c",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
@@ -292,7 +159,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0f1a42c4f0019c60090f07d4a24d772586fd9afc2f307a86cd1f29183842387a1886d75bec52418fd0ff867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a09775755ebfbc5cadb25a00f8f6fffcf63b31acf1732b0c1cf446fb887eee4cce88f8b24facece3649cf867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -329,7 +196,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78c0b22f9f4a79e57c05b0d9d1dc4f66373f9d974b7b31f5e3740395df305f07",
+        "lastblockhash" : "0x296de8529dbbdf4fff4cb209da7e841d1e7d782e88d4cc3433dfbe862da019ef",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -399,8 +266,10 @@
     "CallRecursiveBombPreCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -411,9 +280,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0xfc634b6c798807cc9c3a513475e6bd05d64806ea4a4fc7bf50d5a5a1668f1ed3",
-                    "mixHash" : "0x1af73fcd4e5e249f6284c63e3c3831a2400317bd843246ca504aafab78921300",
-                    "nonce" : "0x667576e37b8a456a",
+                    "hash" : "0x43bb5e78d268f2de37e65abe8a6d7d3bbad72a99813e7d6a4a3d3da9ff852a2f",
+                    "mixHash" : "0xe32d686c78561f8a41d92195f5270d242b3c855eb2c7b423957ec29080571ad0",
+                    "nonce" : "0x19e5909b35fdc81e",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
@@ -422,7 +291,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a01af73fcd4e5e249f6284c63e3c3831a2400317bd843246ca504aafab7892130088667576e37b8a456af867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0e32d686c78561f8a41d92195f5270d242b3c855eb2c7b423957ec29080571ad08819e5909b35fdc81ef867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -459,7 +328,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc634b6c798807cc9c3a513475e6bd05d64806ea4a4fc7bf50d5a5a1668f1ed3",
+        "lastblockhash" : "0x43bb5e78d268f2de37e65abe8a6d7d3bbad72a99813e7d6a4a3d3da9ff852a2f",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -529,8 +398,10 @@
     "CallRecursiveBombPreCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -541,9 +412,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x09e0ecee5c6e443130eaa40d694d14341b6ef68cc0f3eeef1a65ca4eefc1248d",
-                    "mixHash" : "0x51b9ccf4e427e9f9bcc805c7b504b4664b29eb1b64b39068e99230b707304270",
-                    "nonce" : "0xfc0fb7f96342e24a",
+                    "hash" : "0x0d8912483c896632da9ffc063e58856f8f59a7a63a3472d5a1d94766aa1ec6aa",
+                    "mixHash" : "0xf8b883eb52e382dfa495df948ddbf36328c952786e667711736c4d4f776df444",
+                    "nonce" : "0x7d74734488fe61d2",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x7cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439e",
@@ -552,7 +423,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a051b9ccf4e427e9f9bcc805c7b504b4664b29eb1b64b39068e99230b70730427088fc0fb7f96342e24af867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0f8b883eb52e382dfa495df948ddbf36328c952786e667711736c4d4f776df444887d74734488fe61d2f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -589,7 +460,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09e0ecee5c6e443130eaa40d694d14341b6ef68cc0f3eeef1a65ca4eefc1248d",
+        "lastblockhash" : "0x0d8912483c896632da9ffc063e58856f8f59a7a63a3472d5a1d94766aa1ec6aa",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -648,8 +519,10 @@
     "CallRecursiveBombPreCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -660,9 +533,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa004b5",
-                    "hash" : "0x44c0db9d09c97524bbb09721017aa404b2d5b6ee4817704b3530700fc6eaefee",
-                    "mixHash" : "0xf56561c4cbcf6da081c21f4eb57973531c75536fc4da723cde90995da88b1470",
-                    "nonce" : "0x3ea7bf6913530725",
+                    "hash" : "0x9aa1e6955c44030194961690304cf11401c59af1900073e6ee382e26fe8d555b",
+                    "mixHash" : "0xfbab86f677271b8503f1429e28e8f92658745e941c4bf508c17f8726a99468e3",
+                    "nonce" : "0x67befba893260089",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x7df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9",
@@ -671,7 +544,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a0f56561c4cbcf6da081c21f4eb57973531c75536fc4da723cde90995da88b1470883ea7bf6913530725f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a0fbab86f677271b8503f1429e28e8f92658745e941c4bf508c17f8726a99468e38867befba893260089f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -708,7 +581,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44c0db9d09c97524bbb09721017aa404b2d5b6ee4817704b3530700fc6eaefee",
+        "lastblockhash" : "0x9aa1e6955c44030194961690304cf11401c59af1900073e6ee382e26fe8d555b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
index 4876aca4e..132fdacf3 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
@@ -2,8 +2,10 @@
     "CallcodeLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0xe98bc49a9dd6a9acfb48985c4f5c5c1d5a00422809cf8163e0834327f85c7355",
-                    "mixHash" : "0x180e3acc3840ff6ee3e252614055b3dbdd7a4188335526c9da81a317f2c16c02",
-                    "nonce" : "0x9a899e05d1f630de",
+                    "hash" : "0x71e3dbb2943cb304e063ef34f316c9238e8358d723e2c8b0f27c55ad264a529d",
+                    "mixHash" : "0xcf4f36447d1b11869a6247ab8c25b3bb38f5312a6ab0db5d02481bb9623f9a9a",
+                    "nonce" : "0x95b74c1eadfdcb57",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fd07983948c9ace7e88a6a4a7ec903763627a879638c1578a16e2afa37a87e57a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0180e3acc3840ff6ee3e252614055b3dbdd7a4188335526c9da81a317f2c16c02889a899e05d1f630def862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fd07983948c9ace7e88a6a4a7ec903763627a879638c1578a16e2afa37a87e57a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0cf4f36447d1b11869a6247ab8c25b3bb38f5312a6ab0db5d02481bb9623f9a9a8895b74c1eadfdcb57f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe98bc49a9dd6a9acfb48985c4f5c5c1d5a00422809cf8163e0834327f85c7355",
+        "lastblockhash" : "0x71e3dbb2943cb304e063ef34f316c9238e8358d723e2c8b0f27c55ad264a529d",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -118,137 +120,13 @@
             }
         }
     },
-    "CallcodeLoseGasOOG_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028976",
-                    "hash" : "0x4e72e3fc131c65bc64af385aa84ff9c6632ae66622a87a55ef68ffbfb0e2dc4c",
-                    "mixHash" : "0x42b914a10c86ccf0857a58abc5ae29291626845623a7d12bf4d174a66aee124c",
-                    "nonce" : "0x9f8732fe9581ffb1",
-                    "number" : "0x01",
-                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
-                    "stateRoot" : "0x7e20d9ae21af47b95bf198d7842abc854de03bf502aeff2822ad330c5fbfa9af",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07e20d9ae21af47b95bf198d7842abc854de03bf502aeff2822ad330c5fbfa9afa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a042b914a10c86ccf0857a58abc5ae29291626845623a7d12bf4d174a66aee124c889f8732fe9581ffb1f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
-                "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" : "0x4e72e3fc131c65bc64af385aa84ff9c6632ae66622a87a55ef68ffbfb0e2dc4c",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7689",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x29a2241af62e8976",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -259,9 +137,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x930e6f2014f3a19ed02531f221c377a3bdffed0ead60c16e6bf9f48257554415",
-                    "mixHash" : "0x821c7781f1eafac3c2dea5bf6ecf96f583fafc897d8ecb59102f54b01bac3bca",
-                    "nonce" : "0x77f9f65fa624dddd",
+                    "hash" : "0x31952804e5873420555f8cde15672016497a098f580aa942d9b2cbad2f0e0139",
+                    "mixHash" : "0xaec90d4d2bca244b7c8aca3603d25f53e642f06f4bb9e9dfddc4e7dfc698d08c",
+                    "nonce" : "0xde22fdf20a2a00f0",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
@@ -270,7 +148,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0821c7781f1eafac3c2dea5bf6ecf96f583fafc897d8ecb59102f54b01bac3bca8877f9f65fa624ddddf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0aec90d4d2bca244b7c8aca3603d25f53e642f06f4bb9e9dfddc4e7dfc698d08c88de22fdf20a2a00f0f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -307,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x930e6f2014f3a19ed02531f221c377a3bdffed0ead60c16e6bf9f48257554415",
+        "lastblockhash" : "0x31952804e5873420555f8cde15672016497a098f580aa942d9b2cbad2f0e0139",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -366,8 +244,10 @@
     "CallcodeLoseGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -378,9 +258,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x93cb02d2b92bf34ccfc9e8b0342d53547f4e91265a49c10f5d22295f6d1d70c8",
-                    "mixHash" : "0x2103f64283d5c01ebf3d6a6d092719f626cb87c35ce6fbd3746c17bc01274489",
-                    "nonce" : "0x5e97527fe3d6365c",
+                    "hash" : "0x6f8a5a95ba2576def6efd72506610bc1c2d7bab5f655557c862a2d0e4fa364e0",
+                    "mixHash" : "0xa7e0f9421dbf65d391e241dab7160c6589ed5849e35f86c4c644a1c33a06bc3f",
+                    "nonce" : "0x1df752d26dfcfdc4",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
@@ -389,7 +269,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a02103f64283d5c01ebf3d6a6d092719f626cb87c35ce6fbd3746c17bc01274489885e97527fe3d6365cf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0a7e0f9421dbf65d391e241dab7160c6589ed5849e35f86c4c644a1c33a06bc3f881df752d26dfcfdc4f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -426,7 +306,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93cb02d2b92bf34ccfc9e8b0342d53547f4e91265a49c10f5d22295f6d1d70c8",
+        "lastblockhash" : "0x6f8a5a95ba2576def6efd72506610bc1c2d7bab5f655557c862a2d0e4fa364e0",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -485,8 +365,10 @@
     "CallcodeLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -497,9 +379,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x81b751b7be0df4a79e2085f802ad0fb6608626adfe21cbf3477fcd584337fe73",
-                    "mixHash" : "0x97d27b29e7aeaf5242e6906596f6de8c605d74e5a23b2f8c6fb760d3600aff60",
-                    "nonce" : "0x4ce2fb7161b81dbb",
+                    "hash" : "0x063890c2ca79acdc940e73c1cfbd59c05fdf01cdb83611fa31603e8c186f3646",
+                    "mixHash" : "0x04076f57cca6069697b89a09f496c74505edfa2a45b960316d5435cd309773e1",
+                    "nonce" : "0x298bd6d66d9503f6",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
@@ -508,7 +390,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a097d27b29e7aeaf5242e6906596f6de8c605d74e5a23b2f8c6fb760d3600aff60884ce2fb7161b81dbbf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a004076f57cca6069697b89a09f496c74505edfa2a45b960316d5435cd309773e188298bd6d66d9503f6f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -545,7 +427,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81b751b7be0df4a79e2085f802ad0fb6608626adfe21cbf3477fcd584337fe73",
+        "lastblockhash" : "0x063890c2ca79acdc940e73c1cfbd59c05fdf01cdb83611fa31603e8c186f3646",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -604,8 +486,10 @@
     "CallcodeLoseGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -616,9 +500,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028972",
-                    "hash" : "0x08009071bc3ea1a502deb6e461772382e10e81ddc5077639533dd1bcfa0e13c8",
-                    "mixHash" : "0xbef88486d3f7b6d543192cd88c06344abb928fb788544f38aee37f49d157d744",
-                    "nonce" : "0xc746234af8e57537",
+                    "hash" : "0x59dad72c8bef27d087650f8e1cd1a8ef24da9004d73cb40e626224aeb54e0493",
+                    "mixHash" : "0x485353dea6d1c17b9560e2a0301ca4daad151d2b32f78b4c865b304f7b3e2ff5",
+                    "nonce" : "0xcdb49861e991a921",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
@@ -627,7 +511,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0bef88486d3f7b6d543192cd88c06344abb928fb788544f38aee37f49d157d74488c746234af8e57537f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0485353dea6d1c17b9560e2a0301ca4daad151d2b32f78b4c865b304f7b3e2ff588cdb49861e991a921f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -664,7 +548,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08009071bc3ea1a502deb6e461772382e10e81ddc5077639533dd1bcfa0e13c8",
+        "lastblockhash" : "0x59dad72c8bef27d087650f8e1cd1a8ef24da9004d73cb40e626224aeb54e0493",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
index 804865e19..fcdf21f97 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
@@ -2,8 +2,10 @@
     "Delegatecall1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x012b2c71b657d5b1acfa5c4f69a56309298de9a1d318d64278d516480a3bc0a9",
-                    "mixHash" : "0x4aca36c10bedde96f25a84bdb26d80879ee94ac963b3275e1d3d12d6756fba7e",
-                    "nonce" : "0x5cdbcfa0ff0a1a7c",
+                    "hash" : "0xda1aaef16d70f43be894ea2007d54e9b8292b6c7ccb72b8a72a034bb26e6a863",
+                    "mixHash" : "0x3d43d1e34b66b9fc9a3c01d4f4326ec1f776d8b28cf55133b02143b9cd3e9299",
+                    "nonce" : "0xccd7fad23f94aeaa",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a04aca36c10bedde96f25a84bdb26d80879ee94ac963b3275e1d3d12d6756fba7e885cdbcfa0ff0a1a7cf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a03d43d1e34b66b9fc9a3c01d4f4326ec1f776d8b28cf55133b02143b9cd3e929988ccd7fad23f94aeaaf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x012b2c71b657d5b1acfa5c4f69a56309298de9a1d318d64278d516480a3bc0a9",
+        "lastblockhash" : "0xda1aaef16d70f43be894ea2007d54e9b8292b6c7ccb72b8a72a034bb26e6a863",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -121,140 +123,13 @@
             }
         }
     },
-    "Delegatecall1024OOG_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8720",
-                    "hash" : "0xe46fc2d4c46dd1dc25c75df8c66af0e4c2d35309906223c395ff409773d17336",
-                    "mixHash" : "0xb1f1a324d2a76dbadf85c8e4b80ba8cffcbd309e3a2eaa5ad3d1821cf495fe1a",
-                    "nonce" : "0xd78c9c0f826ca76e",
-                    "number" : "0x01",
-                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
-                    "stateRoot" : "0xa5f2fccb584183d2beb54afc46ee0a58a4817c526dcddf3b72e65900c5bfdc33",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a5f2fccb584183d2beb54afc46ee0a58a4817c526dcddf3b72e65900c5bfdc33a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0b1f1a324d2a76dbadf85c8e4b80ba8cffcbd309e3a2eaa5ad3d1821cf495fe1a88d78c9c0f826ca76ef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "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" : "0xe46fc2d4c46dd1dc25c75df8c66af0e4c2d35309906223c395ff409773d17336",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x29a2241af6668720",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -265,9 +140,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x3f7adba987136d8726aeca94f9020549976fb1fb41969e0dfbb5a789aff64a17",
-                    "mixHash" : "0xe2956ff4b5b5f749a52de67e6b35fc0fb1cccd422dd03644452ad496a814a706",
-                    "nonce" : "0x127c593d8c9eac61",
+                    "hash" : "0x5c02198a37b1b23cef1777c7fe104021996b422bc319b727a90e3625a2c1aea3",
+                    "mixHash" : "0xc02b4a0c74a73043e8e4e013c53399a01eb81abcd6b9574715a15f4e0e7b575a",
+                    "nonce" : "0x3bd2bc50c0ff810e",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -276,7 +151,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0e2956ff4b5b5f749a52de67e6b35fc0fb1cccd422dd03644452ad496a814a70688127c593d8c9eac61f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0c02b4a0c74a73043e8e4e013c53399a01eb81abcd6b9574715a15f4e0e7b575a883bd2bc50c0ff810ef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -313,7 +188,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f7adba987136d8726aeca94f9020549976fb1fb41969e0dfbb5a789aff64a17",
+        "lastblockhash" : "0x5c02198a37b1b23cef1777c7fe104021996b422bc319b727a90e3625a2c1aea3",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -375,8 +250,10 @@
     "Delegatecall1024OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -387,9 +264,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x3e6ee79bc5f666499f07c1e5e9f4b48f68443c83330734f48b6a3574a98e5f8e",
-                    "mixHash" : "0xfb475e0a7438242fdc5762f3abbe342cb67c9389e41a1f75e9cb933e49f3451b",
-                    "nonce" : "0xc979506bc53803bd",
+                    "hash" : "0x34c8af0d712d40f24db992d07189dfda21717f968e7bbc99e302a52bcde012a8",
+                    "mixHash" : "0x12e18ef14a0ca11422e248e1428127ddce575e29d00246cb700e14c8c6515280",
+                    "nonce" : "0x5fb85bf77944edd1",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -398,7 +275,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0fb475e0a7438242fdc5762f3abbe342cb67c9389e41a1f75e9cb933e49f3451b88c979506bc53803bdf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a012e18ef14a0ca11422e248e1428127ddce575e29d00246cb700e14c8c6515280885fb85bf77944edd1f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -435,7 +312,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e6ee79bc5f666499f07c1e5e9f4b48f68443c83330734f48b6a3574a98e5f8e",
+        "lastblockhash" : "0x34c8af0d712d40f24db992d07189dfda21717f968e7bbc99e302a52bcde012a8",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -497,8 +374,10 @@
     "Delegatecall1024OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -509,9 +388,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefe17a",
-                    "hash" : "0x4e4cb1e7c9d79be2b7b86ddc649bde9411cdbe88f92b658f6a58aa33180fa287",
-                    "mixHash" : "0x047302ad9c67dc1e73b945d3207b566de02291195dfcaca82391b20935f9321b",
-                    "nonce" : "0x2007774685b7eb37",
+                    "hash" : "0x317fdd2ac5b06a32db0f1f13fdc38aa49ba9f78ba8dd82dd5b814c18e1cb51a9",
+                    "mixHash" : "0x95d2ddc4cc47ebcc52be7f1f4b329a073d43cd2cd202344161c92b46d0d05ee0",
+                    "nonce" : "0x084d7a2b6fa5add6",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
@@ -520,7 +399,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0047302ad9c67dc1e73b945d3207b566de02291195dfcaca82391b20935f9321b882007774685b7eb37f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a095d2ddc4cc47ebcc52be7f1f4b329a073d43cd2cd202344161c92b46d0d05ee088084d7a2b6fa5add6f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -557,7 +436,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e4cb1e7c9d79be2b7b86ddc649bde9411cdbe88f92b658f6a58aa33180fa287",
+        "lastblockhash" : "0x317fdd2ac5b06a32db0f1f13fdc38aa49ba9f78ba8dd82dd5b814c18e1cb51a9",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -616,8 +495,10 @@
     "Delegatecall1024OOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -628,9 +509,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefd576",
-                    "hash" : "0xefdebe2120552d394aa011ffa21ee1b384376df65306f51979a02ac1301f5fd9",
-                    "mixHash" : "0x786394a6b6e379e7c49ec83e229c513cfafc569a9c5228b76412fef0af3c5a06",
-                    "nonce" : "0x407e1e9a207c4563",
+                    "hash" : "0x4be1c98cc60928d5e627ae719a09c66b177d62329e7cfcac806cd456f16d2d29",
+                    "mixHash" : "0xfaac7b5d512c14f0d4fa37c2bc1fe87d6337cef2900e17b65296af152f1a4717",
+                    "nonce" : "0x257ea05202aed455",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
@@ -639,7 +520,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0786394a6b6e379e7c49ec83e229c513cfafc569a9c5228b76412fef0af3c5a0688407e1e9a207c4563f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0faac7b5d512c14f0d4fa37c2bc1fe87d6337cef2900e17b65296af152f1a471788257ea05202aed455f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -676,7 +557,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefdebe2120552d394aa011ffa21ee1b384376df65306f51979a02ac1301f5fd9",
+        "lastblockhash" : "0x4be1c98cc60928d5e627ae719a09c66b177d62329e7cfcac806cd456f16d2d29",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
index e4d5aa6b9..7d860ce7b 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
@@ -2,8 +2,10 @@
     "Delegatecall1024_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x13f5ec6f7efefd4687fb2464cf4b9470629a102876d250fc151f05bde755b69e",
-                    "mixHash" : "0x69b1b882deb28d78b55457823619e957b1c895a61c5f5cac2f78644ec2d18696",
-                    "nonce" : "0x7604e160d7ac0b3e",
+                    "hash" : "0xbbade59b4e77095dafeef6d01ee035d771c7a35cad7960898e8c61a47c5bf19a",
+                    "mixHash" : "0xa25cd42d3a8f096eae276f1a0bccfeedadd793b2dd29b3c50e5369168cb62420",
+                    "nonce" : "0x1b02b1f6bdb91822",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a069b1b882deb28d78b55457823619e957b1c895a61c5f5cac2f78644ec2d18696887604e160d7ac0b3ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0a25cd42d3a8f096eae276f1a0bccfeedadd793b2dd29b3c50e5369168cb62420881b02b1f6bdb91822f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13f5ec6f7efefd4687fb2464cf4b9470629a102876d250fc151f05bde755b69e",
+        "lastblockhash" : "0xbbade59b4e77095dafeef6d01ee035d771c7a35cad7960898e8c61a47c5bf19a",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "Delegatecall1024_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xabc5ed",
-                    "hash" : "0xca7afed13869209684a5874fa5c9d8d9ae9a6830e97938de3e0a016ce500722f",
-                    "mixHash" : "0x318d7e5bf78fffc50053af3c7fb13bf2851aab5f793e4e3a9d979738fc8eefb8",
-                    "nonce" : "0xb8440c3606c20ccf",
-                    "number" : "0x01",
-                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
-                    "stateRoot" : "0x5187d67bcc898514462b2f8637b92e1f2cd1f79e43600fd2ce785a05aea5c184",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba05187d67bcc898514462b2f8637b92e1f2cd1f79e43600fd2ce785a05aea5c184a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0318d7e5bf78fffc50053af3c7fb13bf2851aab5f793e4e3a9d979738fc8eefb888b8440c3606c20ccff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "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" : "0xca7afed13869209684a5874fa5c9d8d9ae9a6830e97938de3e0a016ce500722f",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x29a2241af6d7c5ed",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x740693e9ac3b222c08d54042fe3fb0f6c35f49eac0d565c5fcf56d810ccad467",
-                    "mixHash" : "0x11baf6ab866c1a0e129fe61ab81482181ed3a98e4aed95e8db56c4161e4aa835",
-                    "nonce" : "0x0c0def66b9c7fcc5",
+                    "hash" : "0x5fccf20e332d117ed207e626614e0c1eb3e02cf1741b4d3876b0bc882dc5cf6a",
+                    "mixHash" : "0x15a49ffad1a73af8d5fd73fdb95c94f30393043a09ca50cf236750aff47c1acd",
+                    "nonce" : "0x482c820f94472a86",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a011baf6ab866c1a0e129fe61ab81482181ed3a98e4aed95e8db56c4161e4aa835880c0def66b9c7fcc5f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a015a49ffad1a73af8d5fd73fdb95c94f30393043a09ca50cf236750aff47c1acd88482c820f94472a86f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x740693e9ac3b222c08d54042fe3fb0f6c35f49eac0d565c5fcf56d810ccad467",
+        "lastblockhash" : "0x5fccf20e332d117ed207e626614e0c1eb3e02cf1741b4d3876b0bc882dc5cf6a",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -372,8 +248,10 @@
     "Delegatecall1024_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x15406c4c7032d791223a69dd7e9966560472a95d1b40346fa3ce414ea90224a9",
-                    "mixHash" : "0x38dd09087ddc025203ddd5d814f94bdf17fd78998b067bee6d1519b952c9d740",
-                    "nonce" : "0xe7cde3bf1648465b",
+                    "hash" : "0x2064dae796a929c2de072b3870ce13a71154d00038caa9b70a5e7c7657c3ac3f",
+                    "mixHash" : "0x4ff17d3260f752238076b1aadd6710c588cf90a185c558c9ae2c837c1b808151",
+                    "nonce" : "0x370b5461d804ffd0",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a038dd09087ddc025203ddd5d814f94bdf17fd78998b067bee6d1519b952c9d74088e7cde3bf1648465bf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a04ff17d3260f752238076b1aadd6710c588cf90a185c558c9ae2c837c1b80815188370b5461d804ffd0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15406c4c7032d791223a69dd7e9966560472a95d1b40346fa3ce414ea90224a9",
+        "lastblockhash" : "0x2064dae796a929c2de072b3870ce13a71154d00038caa9b70a5e7c7657c3ac3f",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -493,8 +371,10 @@
     "Delegatecall1024_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x3c6ddaad3b3bc91bf16f194aaefe392a15572f0dae3784bc1073ea7e18fa2e6d",
-                    "mixHash" : "0x3fc83412c86a23e8123bfe84a776652630cc3c6a36c6e6d1de2a6ddf8ad32104",
-                    "nonce" : "0xf7202b9b428afac0",
+                    "hash" : "0x96a4fb6ad8ac43198baa8d3c24f66e49db102ffeb5f9aa59a88fcfce209ef2dd",
+                    "mixHash" : "0x4bfe1adc671da725715582daae4af58eb0d7e128e7a214d8482aa77ac78203cb",
+                    "nonce" : "0x7a7fafcb5a42d177",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0xdce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a03fc83412c86a23e8123bfe84a776652630cc3c6a36c6e6d1de2a6ddf8ad3210488f7202b9b428afac0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a04bfe1adc671da725715582daae4af58eb0d7e128e7a214d8482aa77ac78203cb887a7fafcb5a42d177f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c6ddaad3b3bc91bf16f194aaefe392a15572f0dae3784bc1073ea7e18fa2e6d",
+        "lastblockhash" : "0x96a4fb6ad8ac43198baa8d3c24f66e49db102ffeb5f9aa59a88fcfce209ef2dd",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -612,8 +492,10 @@
     "Delegatecall1024_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000b42a",
-                    "hash" : "0x774fddf99384a447cd2bdefc6e528be01684f61fc1b0f861cd8bf8d25ecc903f",
-                    "mixHash" : "0xe2c8aaef549544ebffefadbcc58f0023ef899d29dda66613cedf8a982e8a826b",
-                    "nonce" : "0x13652c119a1b340c",
+                    "hash" : "0x3cd746be482aacd722310cb340e565bd5cafa70aaf73b238b518e95e2ac26556",
+                    "mixHash" : "0xb3ddf4f69f168d7ce7aa1c0a613f283b95a1436a24bfe9e7b837cf675208e634",
+                    "nonce" : "0x0da516650d422c78",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0e2c8aaef549544ebffefadbcc58f0023ef899d29dda66613cedf8a982e8a826b8813652c119a1b340cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0b3ddf4f69f168d7ce7aa1c0a613f283b95a1436a24bfe9e7b837cf675208e634880da516650d422c78f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x774fddf99384a447cd2bdefc6e528be01684f61fc1b0f861cd8bf8d25ecc903f",
+        "lastblockhash" : "0x3cd746be482aacd722310cb340e565bd5cafa70aaf73b238b518e95e2ac26556",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
index aaed47743..ee2c0de27 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
@@ -2,8 +2,10 @@
     "callOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9ba8088d4b5d50cd0f2746051bceb99c93a24779c02c97453ac14fb1cc563f54",
-                    "mixHash" : "0x99aeac3a7c74a880afd0f367e09348e2ced247472ba0056b621a175696e1ad07",
-                    "nonce" : "0x3b89d4a949a4a5bb",
+                    "hash" : "0x5c3fd6019f316a14baab627bdccecc594d8a92ce79bab8602b9b280b3bed2c29",
+                    "mixHash" : "0x43ffcd0ad7b9650cd4ddd1608d4a71a9aad1672ee8c2197407e4c3db64ffd47d",
+                    "nonce" : "0xe46f63e7c7ddb385",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a099aeac3a7c74a880afd0f367e09348e2ced247472ba0056b621a175696e1ad07883b89d4a949a4a5bbc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a043ffcd0ad7b9650cd4ddd1608d4a71a9aad1672ee8c2197407e4c3db64ffd47d88e46f63e7c7ddb385c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ba8088d4b5d50cd0f2746051bceb99c93a24779c02c97453ac14fb1cc563f54",
+        "lastblockhash" : "0x5c3fd6019f316a14baab627bdccecc594d8a92ce79bab8602b9b280b3bed2c29",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callOutput1_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xcc55670936e7a7615b9275e4b7c70af74647919b56e8cf7386beaf1030c9b071",
-                    "mixHash" : "0x797c9e3a16ec4d18f8ffb2f4e3c5b1d4dc2deb1d59dd1404ededa9282b344e5b",
-                    "nonce" : "0x5098af518af92b71",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x7c068bacc799d098ee92cbc0591e2e69f87e3470ce03e20c62cdbdceac462aeb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c068bacc799d098ee92cbc0591e2e69f87e3470ce03e20c62cdbdceac462aeba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0797c9e3a16ec4d18f8ffb2f4e3c5b1d4dc2deb1d59dd1404ededa9282b344e5b885098af518af92b71c0c0",
-                "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" : "0xcc55670936e7a7615b9275e4b7c70af74647919b56e8cf7386beaf1030c9b071",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x17ac6503d472231dcf97480217ef732e058facc63f6512283ec0fcea04ab5794",
-                    "mixHash" : "0xa3a349f680474fcd4862633a3a98115196052997ff2e5aa1ee9f3280bd34533f",
-                    "nonce" : "0xe13498401c8bfcd6",
+                    "hash" : "0x34bd5137abd34d7cc50f62d44fde70efde61f7dd3f86ed29bd9e3a27c1927792",
+                    "mixHash" : "0x314e2ad11a132b57bbf5da6b49e23977a4e1e81ad0e42fd33919fa60a4473e66",
+                    "nonce" : "0x2ae90e8189359619",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a3a349f680474fcd4862633a3a98115196052997ff2e5aa1ee9f3280bd34533f88e13498401c8bfcd6c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0314e2ad11a132b57bbf5da6b49e23977a4e1e81ad0e42fd33919fa60a4473e66882ae90e8189359619c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17ac6503d472231dcf97480217ef732e058facc63f6512283ec0fcea04ab5794",
+        "lastblockhash" : "0x34bd5137abd34d7cc50f62d44fde70efde61f7dd3f86ed29bd9e3a27c1927792",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callOutput1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x6da0077545d50fdfa266a58ce911f95ee4f65a26f702e5754b4663c5d17808af",
-                    "mixHash" : "0xfd70caf0347157fbe8585fc95506fc26e35aff79fa2eb2a2f63982518a101fc7",
-                    "nonce" : "0x005aebb29c2f07dc",
+                    "hash" : "0xdd00fe4bb0656e1b0e4ab8d35d6d1c92c11e67ed94ee1897b3f73e82f2d4f544",
+                    "mixHash" : "0x36064ef0b8904a7df389d1e10376a53b315f0e96175c74bdbe03c0adb84d9d0d",
+                    "nonce" : "0x4cf4256316d08944",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fd70caf0347157fbe8585fc95506fc26e35aff79fa2eb2a2f63982518a101fc788005aebb29c2f07dcc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a036064ef0b8904a7df389d1e10376a53b315f0e96175c74bdbe03c0adb84d9d0d884cf4256316d08944c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6da0077545d50fdfa266a58ce911f95ee4f65a26f702e5754b4663c5d17808af",
+        "lastblockhash" : "0xdd00fe4bb0656e1b0e4ab8d35d6d1c92c11e67ed94ee1897b3f73e82f2d4f544",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callOutput1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4d9c638cae00e25655a2eb805bddf222067a3632813734462c22dfcc45f05092",
-                    "mixHash" : "0x9ac9e0fa890172b3b25789924d8a1761e49ed5379a1264f025bbd56f63bd1dec",
-                    "nonce" : "0xa913434d2844c0aa",
+                    "hash" : "0x2c9b4e9088ce31699ee8120312c22149a39941cbea912168548292d9f320df03",
+                    "mixHash" : "0x47f8478e08182543ee96360c01994432003a2c318ec10dffd88d862e7d410376",
+                    "nonce" : "0x3cc1cdc7842de99a",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09ac9e0fa890172b3b25789924d8a1761e49ed5379a1264f025bbd56f63bd1dec88a913434d2844c0aac0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a047f8478e08182543ee96360c01994432003a2c318ec10dffd88d862e7d410376883cc1cdc7842de99ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d9c638cae00e25655a2eb805bddf222067a3632813734462c22dfcc45f05092",
+        "lastblockhash" : "0x2c9b4e9088ce31699ee8120312c22149a39941cbea912168548292d9f320df03",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callOutput1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x38adda092ab2e0a114bb788751f4fcf00ec027f87378aa7380d98ad351866718",
-                    "mixHash" : "0x1b46a77775bfa5d00a69df2b9949222f4b570c131594bfe3ab4ae79dc19a5a07",
-                    "nonce" : "0x50fc592280b579ac",
+                    "hash" : "0xe76ba97bebba5519c5785779d9d05689cf53f9df1178c81a1d105420d1924f69",
+                    "mixHash" : "0x358a800a2364dac8d203ba06ae9f6f7ea22a4ee6e9bfae2c4911a751cc2d7e19",
+                    "nonce" : "0xee350d382d596c0f",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01b46a77775bfa5d00a69df2b9949222f4b570c131594bfe3ab4ae79dc19a5a078850fc592280b579acc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0358a800a2364dac8d203ba06ae9f6f7ea22a4ee6e9bfae2c4911a751cc2d7e1988ee350d382d596c0fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38adda092ab2e0a114bb788751f4fcf00ec027f87378aa7380d98ad351866718",
+        "lastblockhash" : "0xe76ba97bebba5519c5785779d9d05689cf53f9df1178c81a1d105420d1924f69",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
index 033856c73..5d7c79229 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
@@ -2,8 +2,10 @@
     "callOutput1_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x6936f309a21f587b9bc7e0292216989a023fd052eb46fed4438c5bbce7df0563",
-                    "mixHash" : "0xf8cdce5ddf24df781e8a241c380a05181ff20aa805ced4afe687a613a9d0ac77",
-                    "nonce" : "0x68c22bcb78044f33",
+                    "hash" : "0xdfbd371668e8497a507eee14565db441fb6471b543b220166c5f02cd10333ca5",
+                    "mixHash" : "0xbbe3964ea266232c969b7887fc155b767bb3f57d7914878b04ff066ee83e96b0",
+                    "nonce" : "0x240908271e12d559",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0970f9fc821d189de12f6c5b2bdd267b8b9bf2544a70444ea9a790165aa1550c6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0f8cdce5ddf24df781e8a241c380a05181ff20aa805ced4afe687a613a9d0ac778868c22bcb78044f33f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0970f9fc821d189de12f6c5b2bdd267b8b9bf2544a70444ea9a790165aa1550c6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0bbe3964ea266232c969b7887fc155b767bb3f57d7914878b04ff066ee83e96b088240908271e12d559f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6936f309a21f587b9bc7e0292216989a023fd052eb46fed4438c5bbce7df0563",
+        "lastblockhash" : "0xdfbd371668e8497a507eee14565db441fb6471b543b220166c5f02cd10333ca5",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -119,138 +121,13 @@
             }
         }
     },
-    "callOutput1_d0g1v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0xec5cf5f9052d64fc376405a5a182612a3a0ced4596936368cb024fc29b27ec4d",
-                    "mixHash" : "0xb1a67456b805b2faf679b638e3a53eb8ac07aadddc57e100fcf6702fb2e9431f",
-                    "nonce" : "0x06d1d4b332e179e6",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xc3d10c3cfee9ca71e73af93e153aabdfc4ac50abedce9356e490ad3ee08ab141",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c3d10c3cfee9ca71e73af93e153aabdfc4ac50abedce9356e490ad3ee08ab141a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0b1a67456b805b2faf679b638e3a53eb8ac07aadddc57e100fcf6702fb2e9431f8806d1d4b332e179e6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "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" : "0xec5cf5f9052d64fc376405a5a182612a3a0ced4596936368cb024fc29b27ec4d",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -261,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xa172748de14d450d87b97e4fb947ee15aff8a8f037a1adf110ce678f77402aaf",
-                    "mixHash" : "0xfd47f4af7bc8cbc68105255d90771bffdffa143c013c0c1679fa60fde6fef7e7",
-                    "nonce" : "0x40b2c6663a10dce8",
+                    "hash" : "0x57b4b995d1476da48c7db464bff97c93f52376ca38c96964c06fc4f67e2f64c0",
+                    "mixHash" : "0xc61fee970abecf372949b992692937d853a9b529a73d435249ac6532c7757525",
+                    "nonce" : "0xdf566b34d256cb74",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0xd1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220d",
@@ -272,7 +149,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0fd47f4af7bc8cbc68105255d90771bffdffa143c013c0c1679fa60fde6fef7e78840b2c6663a10dce8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0c61fee970abecf372949b992692937d853a9b529a73d435249ac6532c775752588df566b34d256cb74f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -309,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa172748de14d450d87b97e4fb947ee15aff8a8f037a1adf110ce678f77402aaf",
+        "lastblockhash" : "0x57b4b995d1476da48c7db464bff97c93f52376ca38c96964c06fc4f67e2f64c0",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -369,8 +246,10 @@
     "callOutput1_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -381,9 +260,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x989b810ebdd0f8cd8a513733428af4a5ef09cd997c5d6b3dbc0fbeac6cbf5793",
-                    "mixHash" : "0x3bb34b5b4d277da62fb508b0efc77b42c67a818e9022b92bb225655c53a9cd53",
-                    "nonce" : "0x731a9807322b9cd6",
+                    "hash" : "0x562af8bd4cea39e9f4d0a2df586f9304095dbb109d2556ff229bfa8479f48f76",
+                    "mixHash" : "0xacd04cf3bace3f9f4130291c90b7268e7d5f7ebc07b610f71659ba2f7c38b486",
+                    "nonce" : "0xcdaafa8ffbf44385",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0xb42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1",
@@ -392,7 +271,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a03bb34b5b4d277da62fb508b0efc77b42c67a818e9022b92bb225655c53a9cd5388731a9807322b9cd6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0acd04cf3bace3f9f4130291c90b7268e7d5f7ebc07b610f71659ba2f7c38b48688cdaafa8ffbf44385f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -429,7 +308,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x989b810ebdd0f8cd8a513733428af4a5ef09cd997c5d6b3dbc0fbeac6cbf5793",
+        "lastblockhash" : "0x562af8bd4cea39e9f4d0a2df586f9304095dbb109d2556ff229bfa8479f48f76",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -489,8 +368,10 @@
     "callOutput1_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -501,9 +382,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0xca785a632bb3e9d1bac2af3c0d5239320016112a7e07e4f61e7f93b0c07724ce",
-                    "mixHash" : "0xcf2ab154e873a3bc17a9f50a3ca32b49e749291b0c83ee722fcfb2d884c9b8f6",
-                    "nonce" : "0xab920231602c799d",
+                    "hash" : "0x34bcbecf03c0af948042442948411626124efe4ecbfdf67c71bd3b4c1c5901af",
+                    "mixHash" : "0x220b8a7193d02ef0427838c8f60d4169b05db060dcfb1e71335742ed6ebd1494",
+                    "nonce" : "0xc43cea834a128611",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x17ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610dde",
@@ -512,7 +393,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0cf2ab154e873a3bc17a9f50a3ca32b49e749291b0c83ee722fcfb2d884c9b8f688ab920231602c799df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0220b8a7193d02ef0427838c8f60d4169b05db060dcfb1e71335742ed6ebd149488c43cea834a128611f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -549,7 +430,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca785a632bb3e9d1bac2af3c0d5239320016112a7e07e4f61e7f93b0c07724ce",
+        "lastblockhash" : "0x34bcbecf03c0af948042442948411626124efe4ecbfdf67c71bd3b4c1c5901af",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -608,8 +489,10 @@
     "callOutput1_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -620,9 +503,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x8a73db13bc390e718633c66bb0aa3b52c506d8827a7fa3402ee0658a32279526",
-                    "mixHash" : "0x2c48c28ae06a43e7c42880c0db7cc3fe3f72a8eae36df1b599ad4b57e9f81ebb",
-                    "nonce" : "0xc1a88acf8835ff56",
+                    "hash" : "0xd9f07947ec9f966a1e2245670af8557cf36ee02d7e811b9e8c725e5b43d64f99",
+                    "mixHash" : "0xbdb5a6c16bbc50303271b530507ae65a08ab8e8313e56c572ea7c9139795ec88",
+                    "nonce" : "0xa3a97d37da06bffa",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3",
@@ -631,7 +514,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a02c48c28ae06a43e7c42880c0db7cc3fe3f72a8eae36df1b599ad4b57e9f81ebb88c1a88acf8835ff56f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0bdb5a6c16bbc50303271b530507ae65a08ab8e8313e56c572ea7c9139795ec8888a3a97d37da06bffaf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -668,7 +551,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a73db13bc390e718633c66bb0aa3b52c506d8827a7fa3402ee0658a32279526",
+        "lastblockhash" : "0xd9f07947ec9f966a1e2245670af8557cf36ee02d7e811b9e8c725e5b43d64f99",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
index dba671314..7533da2d0 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
@@ -2,8 +2,10 @@
     "callOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc8fb7f37c094eb9520c1a09232498bd1917501ef5102f6cea27f783e9d19d8f1",
-                    "mixHash" : "0x2aa8cd9d4be0b62a669b93a78b1745ba2803cce0c7dcf66f4e504718e70965c7",
-                    "nonce" : "0x704a096a6f9ff2d0",
+                    "hash" : "0xf37bb083e75c0f9f10ecdb1a9d4b2a8bbf0c10ec0e7f599b2fdd5b38910fd647",
+                    "mixHash" : "0x38ec772d66ae44c8843d1a88ef1411b270fa399ff8cef272b39b14ce3ac833e6",
+                    "nonce" : "0x1f211a286ccf6b03",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02aa8cd9d4be0b62a669b93a78b1745ba2803cce0c7dcf66f4e504718e70965c788704a096a6f9ff2d0c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a038ec772d66ae44c8843d1a88ef1411b270fa399ff8cef272b39b14ce3ac833e6881f211a286ccf6b03c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc8fb7f37c094eb9520c1a09232498bd1917501ef5102f6cea27f783e9d19d8f1",
+        "lastblockhash" : "0xf37bb083e75c0f9f10ecdb1a9d4b2a8bbf0c10ec0e7f599b2fdd5b38910fd647",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callOutput2_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x76713315254c5142de95a6e5d05d189060145a057685fddfd66429289fe49115",
-                    "mixHash" : "0xd399c00e438a66b92c41f42375fb71566b25308e06d9161f498a83336c4fe735",
-                    "nonce" : "0x17f6e27e5e8cbec2",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xecccc7d3a7b118766c9d9ae47663f70e1d71e25e1e1298a5c343c6ded93a05ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecccc7d3a7b118766c9d9ae47663f70e1d71e25e1e1298a5c343c6ded93a05eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d399c00e438a66b92c41f42375fb71566b25308e06d9161f498a83336c4fe7358817f6e27e5e8cbec2c0c0",
-                "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" : "0x76713315254c5142de95a6e5d05d189060145a057685fddfd66429289fe49115",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd83550a9fce98b5697b2ec419df55b65d71c06a4bae8433f552dea214402765e",
-                    "mixHash" : "0x248e88dd898b0c812362ea2efc031f75910c921bd06bf25dca2cbd8c8410662b",
-                    "nonce" : "0xebb6d35fcc82b887",
+                    "hash" : "0x4f332b77b06424dc18752572055d0643cc55c7e9e951a57e2fd48a0fe99c5cdb",
+                    "mixHash" : "0xb6c87772445e3d18e83e7c037f172bb1dd8b50fa24d8878a2cdd87c96c140275",
+                    "nonce" : "0x9d259061b7a73806",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0248e88dd898b0c812362ea2efc031f75910c921bd06bf25dca2cbd8c8410662b88ebb6d35fcc82b887c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b6c87772445e3d18e83e7c037f172bb1dd8b50fa24d8878a2cdd87c96c140275889d259061b7a73806c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd83550a9fce98b5697b2ec419df55b65d71c06a4bae8433f552dea214402765e",
+        "lastblockhash" : "0x4f332b77b06424dc18752572055d0643cc55c7e9e951a57e2fd48a0fe99c5cdb",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callOutput2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x651f9a2822eaf284d491e0e7fc4dfb105f0ef72ca6472aded03370cdaf88b43d",
-                    "mixHash" : "0x210893d6d79f72c2610945a093279078f67f191a63b3fe12199a372cf98bc9ad",
-                    "nonce" : "0xac1750867b9aa0e6",
+                    "hash" : "0x62f00de26b87579a6829d0702a7bc8637054b0f3c77e8f77e191647a4b9271c4",
+                    "mixHash" : "0xa0216d0834065460c4732466b598736a3abf8b8cc2a05bb11a76dfc7c05f1b17",
+                    "nonce" : "0xc16ca6041da7a8f6",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0210893d6d79f72c2610945a093279078f67f191a63b3fe12199a372cf98bc9ad88ac1750867b9aa0e6c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a0216d0834065460c4732466b598736a3abf8b8cc2a05bb11a76dfc7c05f1b1788c16ca6041da7a8f6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x651f9a2822eaf284d491e0e7fc4dfb105f0ef72ca6472aded03370cdaf88b43d",
+        "lastblockhash" : "0x62f00de26b87579a6829d0702a7bc8637054b0f3c77e8f77e191647a4b9271c4",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callOutput2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x1aaa4805cc832989f7525d3e7749520d98f1184d7a88d092e59f2f2102d41302",
-                    "mixHash" : "0x044367115ecceb1878ff898e82de5f610390a3766cd16bd7cb6aaa6895afd2eb",
-                    "nonce" : "0x59601933f7e04134",
+                    "hash" : "0x9bb171d61ecfecfc46d0195d0a0c86ac21a812abf230687d7280b9ed73729998",
+                    "mixHash" : "0xb5165a05ed064157b425d3a4b7a9a30cafeb73bdd493c60090eb6951254949e9",
+                    "nonce" : "0xd461ddc9d040d7ed",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0044367115ecceb1878ff898e82de5f610390a3766cd16bd7cb6aaa6895afd2eb8859601933f7e04134c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b5165a05ed064157b425d3a4b7a9a30cafeb73bdd493c60090eb6951254949e988d461ddc9d040d7edc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1aaa4805cc832989f7525d3e7749520d98f1184d7a88d092e59f2f2102d41302",
+        "lastblockhash" : "0x9bb171d61ecfecfc46d0195d0a0c86ac21a812abf230687d7280b9ed73729998",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callOutput2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x1a4753bbc340d6a408ee6a51a968d35857a1a0ed3ce021bd679c95cbc18bfc64",
-                    "mixHash" : "0xca9771efff4059eeb123a7ff67c8fb68ae2a0ad53fffa02cb0dc5e4d379d9acd",
-                    "nonce" : "0xbf93dce97fe4a79c",
+                    "hash" : "0x99721caa6b60a994492ed4a2bdf552e9111ae848eda0875a06a5b31e79aa7b29",
+                    "mixHash" : "0x191dcc1069c100d9755f5bac3201224c8c32fc818eca0bfb44b8614ec7d5a092",
+                    "nonce" : "0x8fe1f366c1427842",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ca9771efff4059eeb123a7ff67c8fb68ae2a0ad53fffa02cb0dc5e4d379d9acd88bf93dce97fe4a79cc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0191dcc1069c100d9755f5bac3201224c8c32fc818eca0bfb44b8614ec7d5a092888fe1f366c1427842c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a4753bbc340d6a408ee6a51a968d35857a1a0ed3ce021bd679c95cbc18bfc64",
+        "lastblockhash" : "0x99721caa6b60a994492ed4a2bdf552e9111ae848eda0875a06a5b31e79aa7b29",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
index 609069167..6425fba44 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
@@ -2,8 +2,10 @@
     "callOutput2_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x4dd5e4e13074d272eab12bcf0141956b665b6a45312834970929b0516d761402",
-                    "mixHash" : "0x7570a0b3e50213fd2b8e7917b50e510ba927572b98d10e64e2ef237be47bd500",
-                    "nonce" : "0x1ec0e6ff0a1f8e52",
+                    "hash" : "0x909639be442e217fe9066d01ffc4af23e863185bc5c4916721a0b984e75a6879",
+                    "mixHash" : "0x54818dcecd7ecd3dc47ad07cae2f4d8bb7ea8adb301c0c0930eac31b02ffec55",
+                    "nonce" : "0x3d83d0e5fae8bb6b",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090ae6a5df04711f034c55a3346433e415dc824f23c2e982dff5960fff5cd8d8da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a07570a0b3e50213fd2b8e7917b50e510ba927572b98d10e64e2ef237be47bd500881ec0e6ff0a1f8e52f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090ae6a5df04711f034c55a3346433e415dc824f23c2e982dff5960fff5cd8d8da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a054818dcecd7ecd3dc47ad07cae2f4d8bb7ea8adb301c0c0930eac31b02ffec55883d83d0e5fae8bb6bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4dd5e4e13074d272eab12bcf0141956b665b6a45312834970929b0516d761402",
+        "lastblockhash" : "0x909639be442e217fe9066d01ffc4af23e863185bc5c4916721a0b984e75a6879",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -119,138 +121,13 @@
             }
         }
     },
-    "callOutput2_d0g1v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0xab0eae9a6230a393625ff5dfbd837b21c2df52c3d95ee5e3391356b7409440c3",
-                    "mixHash" : "0x88170b644f37166e7b7e5c3b4aabfbc1971e93a590c574619ea248c03b4c6b8b",
-                    "nonce" : "0xc5ce1711aeafe3a0",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xc4d36a03fb511900721aea6396c11d41f38d97ad41f66c9dbb4d618ac834ddfd",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d36a03fb511900721aea6396c11d41f38d97ad41f66c9dbb4d618ac834ddfda0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a088170b644f37166e7b7e5c3b4aabfbc1971e93a590c574619ea248c03b4c6b8b88c5ce1711aeafe3a0f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "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" : "0xab0eae9a6230a393625ff5dfbd837b21c2df52c3d95ee5e3391356b7409440c3",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -261,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xa71b5f1271907d3a54ebc67cffdac8f4141634dbd0b02ab298fb617292f8defd",
-                    "mixHash" : "0x42fbace9a755e2053f4362059e1c32a32267db03f50a11218ab2caaded7fd11f",
-                    "nonce" : "0x9c0288f0be83a6f8",
+                    "hash" : "0xf3ab5146dcf6c2b615a17abd810d42533b3e642c67dc6095f03d5cb344b26f85",
+                    "mixHash" : "0xa215626b0d743ef2a8b7d97ec6f35306c2b3797bffdd45027106ad26b11481a2",
+                    "nonce" : "0xdaf6f4aa7724de0b",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x8155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619",
@@ -272,7 +149,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a042fbace9a755e2053f4362059e1c32a32267db03f50a11218ab2caaded7fd11f889c0288f0be83a6f8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0a215626b0d743ef2a8b7d97ec6f35306c2b3797bffdd45027106ad26b11481a288daf6f4aa7724de0bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -309,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa71b5f1271907d3a54ebc67cffdac8f4141634dbd0b02ab298fb617292f8defd",
+        "lastblockhash" : "0xf3ab5146dcf6c2b615a17abd810d42533b3e642c67dc6095f03d5cb344b26f85",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -369,8 +246,10 @@
     "callOutput2_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -381,9 +260,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x8bf31d4dab38d0afdca3e07a401e1107ceff6313a0fd85726931be218bdcb310",
-                    "mixHash" : "0x2b651eb201686304ff1ee1f5b63ccfb692001c928343b1a8e399b267296f4b7f",
-                    "nonce" : "0xee43b28f104c7158",
+                    "hash" : "0x9ccbca616fdad49475cf80707d63e315a52a5f48e7de915bbd2b3899845bacfc",
+                    "mixHash" : "0xa147abbd7a84dfd07a9af17ae2a38f0574c6576b7c59a267c0127cf274e6860a",
+                    "nonce" : "0x3441074ba2d61f6e",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x8c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918c",
@@ -392,7 +271,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a02b651eb201686304ff1ee1f5b63ccfb692001c928343b1a8e399b267296f4b7f88ee43b28f104c7158f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0a147abbd7a84dfd07a9af17ae2a38f0574c6576b7c59a267c0127cf274e6860a883441074ba2d61f6ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -429,7 +308,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bf31d4dab38d0afdca3e07a401e1107ceff6313a0fd85726931be218bdcb310",
+        "lastblockhash" : "0x9ccbca616fdad49475cf80707d63e315a52a5f48e7de915bbd2b3899845bacfc",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -489,8 +368,10 @@
     "callOutput2_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -501,9 +382,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0x07a6ec4f2695f2fc10ad4c9c13d41338b10c774ac0e83337539b049a330f2aaf",
-                    "mixHash" : "0xd31ee3fe77f2934b32c0177af386f74b5dd4d76399973e3e70e26ad03d9cdf5c",
-                    "nonce" : "0x9fc33c602279ebc8",
+                    "hash" : "0xb157f07586cafc4aba5343ac02d4eb4b837df7b7ae8b1fc8527462f62bfc28eb",
+                    "mixHash" : "0xb6ef694aaf3e2061082e1c2962654b5fb804a8daba6cf9c0071c1d8a7f2a175d",
+                    "nonce" : "0xcb18c426d5c9a7f7",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x38c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36a",
@@ -512,7 +393,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0d31ee3fe77f2934b32c0177af386f74b5dd4d76399973e3e70e26ad03d9cdf5c889fc33c602279ebc8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0b6ef694aaf3e2061082e1c2962654b5fb804a8daba6cf9c0071c1d8a7f2a175d88cb18c426d5c9a7f7f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -549,7 +430,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07a6ec4f2695f2fc10ad4c9c13d41338b10c774ac0e83337539b049a330f2aaf",
+        "lastblockhash" : "0xb157f07586cafc4aba5343ac02d4eb4b837df7b7ae8b1fc8527462f62bfc28eb",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -608,8 +489,10 @@
     "callOutput2_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -620,9 +503,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x670a350e872809191012f910e9716748a964e6c940e25884122b8f71f7a462db",
-                    "mixHash" : "0x1174472bb656eb259801393c616a7e12eee1d324f762226f251f9bfd60955a91",
-                    "nonce" : "0x03c6a8e708c69e45",
+                    "hash" : "0x21e6681459b95f14a0d5f43b37501be36f8e5564c63268d26972be1d97201ca0",
+                    "mixHash" : "0x8f65b76ce9a3eab10a133aca154df7b9d0523f5f64ba5e3d252a91f57f629569",
+                    "nonce" : "0x6759342798cbd0ba",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146",
@@ -631,7 +514,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a01174472bb656eb259801393c616a7e12eee1d324f762226f251f9bfd60955a918803c6a8e708c69e45f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a08f65b76ce9a3eab10a133aca154df7b9d0523f5f64ba5e3d252a91f57f629569886759342798cbd0baf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -668,7 +551,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x670a350e872809191012f910e9716748a964e6c940e25884122b8f71f7a462db",
+        "lastblockhash" : "0x21e6681459b95f14a0d5f43b37501be36f8e5564c63268d26972be1d97201ca0",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
index 4f1b68da7..b8e23c73f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
@@ -2,8 +2,10 @@
     "callOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4fc2e8dfee126733a6b8a8d6386fa94a56639f3cd8a77a20a4c38afa011a7b22",
-                    "mixHash" : "0x8129a1a1e2e279f9f319095b5d08601b7febf31b9f8596c9491b9c62b725174a",
-                    "nonce" : "0x61718d827837fb01",
+                    "hash" : "0x1a623504727c07df510a1031bea8bc47bac012302da7afeaf6f7900b88587c35",
+                    "mixHash" : "0xdab1b13db9f09bb1eda2c687f1f2fbcb9b3ff9ad1c064a18557f09f10289af8f",
+                    "nonce" : "0x8c29dd43b737e05e",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b92e6fb623cef4bb8a63bcc45546da5f8fa6d10bf8839586b83645e43fbec58ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08129a1a1e2e279f9f319095b5d08601b7febf31b9f8596c9491b9c62b725174a8861718d827837fb01c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b92e6fb623cef4bb8a63bcc45546da5f8fa6d10bf8839586b83645e43fbec58ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0dab1b13db9f09bb1eda2c687f1f2fbcb9b3ff9ad1c064a18557f09f10289af8f888c29dd43b737e05ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4fc2e8dfee126733a6b8a8d6386fa94a56639f3cd8a77a20a4c38afa011a7b22",
+        "lastblockhash" : "0x1a623504727c07df510a1031bea8bc47bac012302da7afeaf6f7900b88587c35",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callOutput3Fail_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xdec8968820945e72e32b01ca62e0f98d38d81e7f6a401cf7d80a400d4c80ce5e",
-                    "mixHash" : "0xa5e7b63fdbe04f2c1c286d5bd4bdd2f9dace1d42986006c589461f7ca2cabe47",
-                    "nonce" : "0x15ea1de8078cb401",
-                    "number" : "0x01",
-                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdc6bd80463d9cfd6d07e5ccf8aa4366a032bc0c2b64a1486afcb7de21c4d2edd",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6bd80463d9cfd6d07e5ccf8aa4366a032bc0c2b64a1486afcb7de21c4d2edda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a5e7b63fdbe04f2c1c286d5bd4bdd2f9dace1d42986006c589461f7ca2cabe478815ea1de8078cb401c0c0",
-                "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" : "0xdec8968820945e72e32b01ca62e0f98d38d81e7f6a401cf7d80a400d4c80ce5e",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5e022a13e8fe3d2ef3acb364e3145d7ae7024be960f4f641c578ab2087a00add",
-                    "mixHash" : "0xeac02871e6576fb280de9e0b4dddac92d14064e7b18a12697042f456356d0f84",
-                    "nonce" : "0x4b832a9d775d2e04",
+                    "hash" : "0x59a7cf5e9c4c5792d00f8fe05e1724f31b0094ff6dc9977f502dbdd5d47b3aa2",
+                    "mixHash" : "0x15ea1ab5712a72c472e09c6500c055b971b5ab1e9b827740e8cddea2650320eb",
+                    "nonce" : "0xf3498ecb2b23c24e",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0eac02871e6576fb280de9e0b4dddac92d14064e7b18a12697042f456356d0f84884b832a9d775d2e04c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a015ea1ab5712a72c472e09c6500c055b971b5ab1e9b827740e8cddea2650320eb88f3498ecb2b23c24ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e022a13e8fe3d2ef3acb364e3145d7ae7024be960f4f641c578ab2087a00add",
+        "lastblockhash" : "0x59a7cf5e9c4c5792d00f8fe05e1724f31b0094ff6dc9977f502dbdd5d47b3aa2",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callOutput3Fail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9d8476a0d0b3d4f682efb6ee2b056f6c65048a11b31b58bfc0aa9cbcc5c61fe7",
-                    "mixHash" : "0x4d7ab73b247e88d2a69f1b94aa9d012fe9feeb6bd0dd4c1a7da78a8454dd86fd",
-                    "nonce" : "0xf86d8883cbe71cc0",
+                    "hash" : "0xafb5ae3a3f611899f067c25d07fa5e9f50e6c88cf82c322ec2497f96506df4e8",
+                    "mixHash" : "0x835890226b9b9434a7b7420d1c4e9f140af6e16306c47869cd70a15cd20447df",
+                    "nonce" : "0xb28ddbeeed13ce03",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04d7ab73b247e88d2a69f1b94aa9d012fe9feeb6bd0dd4c1a7da78a8454dd86fd88f86d8883cbe71cc0c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0835890226b9b9434a7b7420d1c4e9f140af6e16306c47869cd70a15cd20447df88b28ddbeeed13ce03c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d8476a0d0b3d4f682efb6ee2b056f6c65048a11b31b58bfc0aa9cbcc5c61fe7",
+        "lastblockhash" : "0xafb5ae3a3f611899f067c25d07fa5e9f50e6c88cf82c322ec2497f96506df4e8",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callOutput3Fail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb6bb7fcde47597dcfd779a7a9efba054b2ae7769528ed0ce5948e55835ea3027",
-                    "mixHash" : "0x356afd782569f4cef9be41a85ad3fad2f1e7a58bb8b16c268730451056227f8e",
-                    "nonce" : "0x035ac58be8ad6557",
+                    "hash" : "0x16d02de966c0557d98fe8c0c500b8afed5666fb903e7cda203d5c3a0ed6e46bb",
+                    "mixHash" : "0x9227f12134c353748914c1f0e1b801afb47187ce49f7168f15b0c718e61776a2",
+                    "nonce" : "0x0f7e0fcc1b2161e5",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0356afd782569f4cef9be41a85ad3fad2f1e7a58bb8b16c268730451056227f8e88035ac58be8ad6557c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09227f12134c353748914c1f0e1b801afb47187ce49f7168f15b0c718e61776a2880f7e0fcc1b2161e5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6bb7fcde47597dcfd779a7a9efba054b2ae7769528ed0ce5948e55835ea3027",
+        "lastblockhash" : "0x16d02de966c0557d98fe8c0c500b8afed5666fb903e7cda203d5c3a0ed6e46bb",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callOutput3Fail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xda16b17cb6fd4adc57a7119021731d336921fb3101348034819e0165639a0cdf",
-                    "mixHash" : "0x63a40001e99fdd60ef02f6a346140d139af834d82b6c149a205d41c97070189a",
-                    "nonce" : "0xf6aa9be7af40f6db",
+                    "hash" : "0xba99476f436ffa539ebf9da213d75a67fac8edf72ee7abbf4bf8b2f7e2d764a9",
+                    "mixHash" : "0xe13b4bb708851350df49ce7044e858d010ec4eb3ba1878165ee12b2f445bda2e",
+                    "nonce" : "0x402cc1041f90fc48",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a063a40001e99fdd60ef02f6a346140d139af834d82b6c149a205d41c97070189a88f6aa9be7af40f6dbc0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e13b4bb708851350df49ce7044e858d010ec4eb3ba1878165ee12b2f445bda2e88402cc1041f90fc48c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda16b17cb6fd4adc57a7119021731d336921fb3101348034819e0165639a0cdf",
+        "lastblockhash" : "0xba99476f436ffa539ebf9da213d75a67fac8edf72ee7abbf4bf8b2f7e2d764a9",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
index 2d846f9b7..cf14d8800 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
@@ -2,8 +2,10 @@
     "callOutput3Fail_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x6ed4d5acebf8ffc97ced15cdd94d3537d3c1e25b590f419d89566a7439d011ea",
-                    "mixHash" : "0x27fd632f8aa08029d1ec8b51f69fe8a793f0c203036f8aad422a4a90c299205d",
-                    "nonce" : "0x2cfc2241a781c37e",
+                    "hash" : "0x7b2ad6dd281ba2cc7181f3cc0aa2143950f29c74b4460c746a129a4fdbcf5214",
+                    "mixHash" : "0xf67821d2cc7e55fad96684f89a6ddcf173280af6118c8a51cc91dd92f310267e",
+                    "nonce" : "0xf9cbdc95f09748c8",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088e0ba48b0d1753d5c8be6bbebdafa72412ef376475700249d854e22520d369aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a027fd632f8aa08029d1ec8b51f69fe8a793f0c203036f8aad422a4a90c299205d882cfc2241a781c37ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088e0ba48b0d1753d5c8be6bbebdafa72412ef376475700249d854e22520d369aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0f67821d2cc7e55fad96684f89a6ddcf173280af6118c8a51cc91dd92f310267e88f9cbdc95f09748c8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ed4d5acebf8ffc97ced15cdd94d3537d3c1e25b590f419d89566a7439d011ea",
+        "lastblockhash" : "0x7b2ad6dd281ba2cc7181f3cc0aa2143950f29c74b4460c746a129a4fdbcf5214",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -119,138 +121,13 @@
             }
         }
     },
-    "callOutput3Fail_d0g1v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "0x2d6ce45f87455a522981079e0303babbffcd6923e89192ee0ce5077300176d07",
-                    "mixHash" : "0xc768714f541e1d43505d00e9cd9be39a2702c13969aa9f984438e47105d13d1f",
-                    "nonce" : "0x28701d81ae654819",
-                    "number" : "0x01",
-                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
-                    "stateRoot" : "0x8c70458f06bcbe701d445d4937a19130c96cf8ed320e1ee5069b4bad49f86ea5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c70458f06bcbe701d445d4937a19130c96cf8ed320e1ee5069b4bad49f86ea5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0c768714f541e1d43505d00e9cd9be39a2702c13969aa9f984438e47105d13d1f8828701d81ae654819f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "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" : "0x2d6ce45f87455a522981079e0303babbffcd6923e89192ee0ce5077300176d07",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -261,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x367e157cfa42e9a3c4a6ef45613241df49e2de24d79fe23c316f280d5aa13e9e",
-                    "mixHash" : "0xfc7d7fe9da3c7585d414faee860c88f21ca98fe3fc22beb6f58d46dbd71ef7d7",
-                    "nonce" : "0x94abe757f8c85e0b",
+                    "hash" : "0xb8fd687fb763dd98154654d1e7ed95e6e1eb6b39836eb46e3740f2ffce45162b",
+                    "mixHash" : "0x5f269128ed92855e42718e96e53ff40f124a6f56bb646c66f7bc616190c9cf8f",
+                    "nonce" : "0x1e395ced02c1b75b",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x7e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278",
@@ -272,7 +149,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0fc7d7fe9da3c7585d414faee860c88f21ca98fe3fc22beb6f58d46dbd71ef7d78894abe757f8c85e0bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a05f269128ed92855e42718e96e53ff40f124a6f56bb646c66f7bc616190c9cf8f881e395ced02c1b75bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -309,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x367e157cfa42e9a3c4a6ef45613241df49e2de24d79fe23c316f280d5aa13e9e",
+        "lastblockhash" : "0xb8fd687fb763dd98154654d1e7ed95e6e1eb6b39836eb46e3740f2ffce45162b",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -369,8 +246,10 @@
     "callOutput3Fail_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -381,9 +260,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0xd9ad7d396653c592142b403ddd4c0a1093256d4b7f25e85208c0eacf0862c7a8",
-                    "mixHash" : "0x12e49d863d74a3748e5ddc8f8cef4f694dd49f1318782a039236b1b2a14e7f0c",
-                    "nonce" : "0xc8acb08743cc578d",
+                    "hash" : "0x62e9e23cf9752cf4c980dfb2abedae18f44d50a17e7e2fda8930c9c6de0895dc",
+                    "mixHash" : "0x53f95098fb043e5f5f2a490d699de2f4952b9038091637dfba3a93c01a5fa2c7",
+                    "nonce" : "0x646a583fed4773eb",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974",
@@ -392,7 +271,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a012e49d863d74a3748e5ddc8f8cef4f694dd49f1318782a039236b1b2a14e7f0c88c8acb08743cc578df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a053f95098fb043e5f5f2a490d699de2f4952b9038091637dfba3a93c01a5fa2c788646a583fed4773ebf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -429,7 +308,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9ad7d396653c592142b403ddd4c0a1093256d4b7f25e85208c0eacf0862c7a8",
+        "lastblockhash" : "0x62e9e23cf9752cf4c980dfb2abedae18f44d50a17e7e2fda8930c9c6de0895dc",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -489,8 +368,10 @@
     "callOutput3Fail_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -501,9 +382,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0xf1a98bff9294751a41f7ecc43b282a6af622af4c8c282b2cb3813001a28f0a43",
-                    "mixHash" : "0x928f490a07248bf4e8e5cfae02eb39fa6482d392f6e69b1fab660ee24d334d43",
-                    "nonce" : "0x4bab589d9a367fe6",
+                    "hash" : "0x283325bc503f28357e0dad7441b083d82e2bb6bfecc561110be5cfdd11b6764a",
+                    "mixHash" : "0xeacf14177b3f9bf48647f3520cb3253bd71cad2fae2fac22a854c5cf79e9c1a4",
+                    "nonce" : "0x705a9bac72a5a1ba",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0xba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0f",
@@ -512,7 +393,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0928f490a07248bf4e8e5cfae02eb39fa6482d392f6e69b1fab660ee24d334d43884bab589d9a367fe6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0eacf14177b3f9bf48647f3520cb3253bd71cad2fae2fac22a854c5cf79e9c1a488705a9bac72a5a1baf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -549,7 +430,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1a98bff9294751a41f7ecc43b282a6af622af4c8c282b2cb3813001a28f0a43",
+        "lastblockhash" : "0x283325bc503f28357e0dad7441b083d82e2bb6bfecc561110be5cfdd11b6764a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -608,8 +489,10 @@
     "callOutput3Fail_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -620,9 +503,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163c9",
-                    "hash" : "0xf33f0f33881b13b8bae21eae3ff66fe69372048ca796fbf815e52fab8e43e942",
-                    "mixHash" : "0xde9c7fd6730b52873289d4ecff5179da09e8d02d5292a1f05c94cb3dfce745f4",
-                    "nonce" : "0xe995fc5bec673792",
+                    "hash" : "0xfbb08e12394a9c5ef8680a7e4c6f1b3ba4b7b535710311352a5e894581672cd2",
+                    "mixHash" : "0xf785d4704761cc2e6db8876117d652ba3e321d210b4b28f7fa65e38bc6e6d7c0",
+                    "nonce" : "0xdf20f0026fe5c3b3",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x4f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02",
@@ -631,7 +514,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0de9c7fd6730b52873289d4ecff5179da09e8d02d5292a1f05c94cb3dfce745f488e995fc5bec673792f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0f785d4704761cc2e6db8876117d652ba3e321d210b4b28f7fa65e38bc6e6d7c088df20f0026fe5c3b3f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -668,7 +551,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf33f0f33881b13b8bae21eae3ff66fe69372048ca796fbf815e52fab8e43e942",
+        "lastblockhash" : "0xfbb08e12394a9c5ef8680a7e4c6f1b3ba4b7b535710311352a5e894581672cd2",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
index a47855e28..8207335a3 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
@@ -2,8 +2,10 @@
     "callOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x734c18e38dc0b505104279d29efbd19308d179331a5b21c2eff34319fa4ae23b",
-                    "mixHash" : "0x6519b763287f83eb96e304a9795dcb9d56333dacb55d0765fb167b05abcf21ab",
-                    "nonce" : "0x6ab1f365ee92074e",
+                    "hash" : "0xad20a2b46cc21fd7005b097a18505fe5fe9c738b9f3d906d77abcf5113afa15f",
+                    "mixHash" : "0x7e4c28a754826ffbbe8367304e524f4bdbf0c519d7549c1a9402a796ded5989d",
+                    "nonce" : "0xded203ab1de289c4",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06519b763287f83eb96e304a9795dcb9d56333dacb55d0765fb167b05abcf21ab886ab1f365ee92074ec0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07e4c28a754826ffbbe8367304e524f4bdbf0c519d7549c1a9402a796ded5989d88ded203ab1de289c4c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x734c18e38dc0b505104279d29efbd19308d179331a5b21c2eff34319fa4ae23b",
+        "lastblockhash" : "0xad20a2b46cc21fd7005b097a18505fe5fe9c738b9f3d906d77abcf5113afa15f",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callOutput3_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xf98ea290127bfea12a76f9b3b261d76fbde99d637f48e2f2c06f2e4ee682903e",
-                    "mixHash" : "0xe96e7a79a61526931feb7675f2e4b8270e4c2dd1441d5f2d239a7aa652beb026",
-                    "nonce" : "0x361515d197bb50af",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xb6003d2c01ee74e7893ad02d7cb8a21679c517204dfa75229466c644334c04a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6003d2c01ee74e7893ad02d7cb8a21679c517204dfa75229466c644334c04a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e96e7a79a61526931feb7675f2e4b8270e4c2dd1441d5f2d239a7aa652beb02688361515d197bb50afc0c0",
-                "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" : "0xf98ea290127bfea12a76f9b3b261d76fbde99d637f48e2f2c06f2e4ee682903e",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xaf16c05be53d611e3386ce1932d6889bd23a62eb39a42531378c37174e671921",
-                    "mixHash" : "0x1f02d0e6497e6de867e411a0407bb8cfc5bdf720a555a18c797a6dfe7de73a75",
-                    "nonce" : "0x9bb41e32da86c5c1",
+                    "hash" : "0x9446bcc988174210d12579de71102fcd7175c871b07fd94212b62224dd5f3e30",
+                    "mixHash" : "0x6a262bdf5cf09641fff5b789ceff870ab4966208ac5c7caa9eb0808b1b337b8a",
+                    "nonce" : "0xd7c2d229a3a25723",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01f02d0e6497e6de867e411a0407bb8cfc5bdf720a555a18c797a6dfe7de73a75889bb41e32da86c5c1c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06a262bdf5cf09641fff5b789ceff870ab4966208ac5c7caa9eb0808b1b337b8a88d7c2d229a3a25723c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf16c05be53d611e3386ce1932d6889bd23a62eb39a42531378c37174e671921",
+        "lastblockhash" : "0x9446bcc988174210d12579de71102fcd7175c871b07fd94212b62224dd5f3e30",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callOutput3_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc7bbae7bdbf619d1dd69c1c08b97987070a0247ec3bf6b2248de6e2cadf999a1",
-                    "mixHash" : "0xa720bd07e1771162de3c1321be032ac15cda1efabaa061d5de41e81aca9ad18c",
-                    "nonce" : "0x0e31db700e8351cb",
+                    "hash" : "0x9846e5228df3ff65fd15aef75a7e9c41db7703427dd2a5bd68fe5bfe490b57a2",
+                    "mixHash" : "0x7c315ea144852de4fee08f78038e9f6dfaf8d88f6b4a723b3dc30299d1004291",
+                    "nonce" : "0x8f56e794fc51ac5c",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a720bd07e1771162de3c1321be032ac15cda1efabaa061d5de41e81aca9ad18c880e31db700e8351cbc0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07c315ea144852de4fee08f78038e9f6dfaf8d88f6b4a723b3dc30299d1004291888f56e794fc51ac5cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7bbae7bdbf619d1dd69c1c08b97987070a0247ec3bf6b2248de6e2cadf999a1",
+        "lastblockhash" : "0x9846e5228df3ff65fd15aef75a7e9c41db7703427dd2a5bd68fe5bfe490b57a2",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callOutput3_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x599aeaec3ca03f662263280af7ce7df9acb0d8c51fb5c8175f147eb134d44353",
-                    "mixHash" : "0xd34b496949775c8d200e0359d5af120654f49516612d3dde54e7e18c6e85d23f",
-                    "nonce" : "0x74d1bea5f86599e8",
+                    "hash" : "0xcacf99d4072b25d049e3713011bc80b72696792d93cf3691355a19a17499a618",
+                    "mixHash" : "0x305b394faea8fc02f138a6b7129e70c58534e736b927dd9c548903ed86a1954b",
+                    "nonce" : "0x7eabada5fcc0cf04",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d34b496949775c8d200e0359d5af120654f49516612d3dde54e7e18c6e85d23f8874d1bea5f86599e8c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0305b394faea8fc02f138a6b7129e70c58534e736b927dd9c548903ed86a1954b887eabada5fcc0cf04c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x599aeaec3ca03f662263280af7ce7df9acb0d8c51fb5c8175f147eb134d44353",
+        "lastblockhash" : "0xcacf99d4072b25d049e3713011bc80b72696792d93cf3691355a19a17499a618",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callOutput3_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x401885211c9da8c0d9e0c5f3d0172c01b423a394278d6751100c64352be0d810",
-                    "mixHash" : "0xb9c00ecf47e078cdfa0ccbf76b501420f7c29ebee066c3912f31e5406a79ce1e",
-                    "nonce" : "0x4ad1e96f3ed78925",
+                    "hash" : "0xdfcc93a7000467ef62231f959d0571c77f5b1a41a2230f428d9f12964d7f1509",
+                    "mixHash" : "0xd2b6e386f7c8fdaab66d14e6f849114e80f97289202b7ae9c3631a054d478b8e",
+                    "nonce" : "0x7c528fd7075b3c24",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b9c00ecf47e078cdfa0ccbf76b501420f7c29ebee066c3912f31e5406a79ce1e884ad1e96f3ed78925c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d2b6e386f7c8fdaab66d14e6f849114e80f97289202b7ae9c3631a054d478b8e887c528fd7075b3c24c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x401885211c9da8c0d9e0c5f3d0172c01b423a394278d6751100c64352be0d810",
+        "lastblockhash" : "0xdfcc93a7000467ef62231f959d0571c77f5b1a41a2230f428d9f12964d7f1509",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
index a87859d48..3dd7325de 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
@@ -2,8 +2,10 @@
     "callOutput3_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x7ab6c6dccc9ea09b76b2a3384bb74eb26ee0db5a8ecb7f86231a1a9990323ce6",
-                    "mixHash" : "0xbd05824467238574c0c90acd815719f3db2a6b3b3a2d5101a9981b3d27d4f7a8",
-                    "nonce" : "0x32ef1e709faada5a",
+                    "hash" : "0x67bc5b77b6ce9b7f45de61de80baf8edd0af0334213073616e63cd37849d5703",
+                    "mixHash" : "0xbdf3da2496e2ef1fbbefedd5892776c651e869e264e11113773117a034483c83",
+                    "nonce" : "0x6e84e075649e01f3",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8bf0e598738366eee0ef52bf0547e836c060a169c46283790dca9227de0a1c8a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0bd05824467238574c0c90acd815719f3db2a6b3b3a2d5101a9981b3d27d4f7a88832ef1e709faada5af865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8bf0e598738366eee0ef52bf0547e836c060a169c46283790dca9227de0a1c8a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0bdf3da2496e2ef1fbbefedd5892776c651e869e264e11113773117a034483c83886e84e075649e01f3f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ab6c6dccc9ea09b76b2a3384bb74eb26ee0db5a8ecb7f86231a1a9990323ce6",
+        "lastblockhash" : "0x67bc5b77b6ce9b7f45de61de80baf8edd0af0334213073616e63cd37849d5703",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -119,138 +121,13 @@
             }
         }
     },
-    "callOutput3_d0g1v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x80bcd7eb0629368cce9c25c60409bcd2c010481b97598eeb5c75563f60f64efd",
-                    "mixHash" : "0x08fbfce683c534282bd3210064068fc6e6054d529f917d7633e794cf2828a7a0",
-                    "nonce" : "0x270a9c7285a10586",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0x4000e18ce03d7f423d8534a1125745dca8e8afb0e7f1e9c9a718d0e44a3df87d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04000e18ce03d7f423d8534a1125745dca8e8afb0e7f1e9c9a718d0e44a3df87da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a008fbfce683c534282bd3210064068fc6e6054d529f917d7633e794cf2828a7a088270a9c7285a10586f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "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" : "0x80bcd7eb0629368cce9c25c60409bcd2c010481b97598eeb5c75563f60f64efd",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -261,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xdb9852308d5c9d7073352c6200799753d1f284b232f39720b8eff5b8bc2071c8",
-                    "mixHash" : "0x0173bf6dfe6b93d54894b9edc06a2c6d1c444d8ad424c9ba5f400a3f2700c641",
-                    "nonce" : "0xfd42ad16abcf4b45",
+                    "hash" : "0x63236786b090ab051082334b3a828d9a528f1cb3d91aae7afb87dde69915af70",
+                    "mixHash" : "0xfebb11b81d80e6d6c2b23d88481e054b6d3b3b84fa7935ec0addd307de5a0a56",
+                    "nonce" : "0x732973215cda0db8",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x19504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afc",
@@ -272,7 +149,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a00173bf6dfe6b93d54894b9edc06a2c6d1c444d8ad424c9ba5f400a3f2700c64188fd42ad16abcf4b45f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0febb11b81d80e6d6c2b23d88481e054b6d3b3b84fa7935ec0addd307de5a0a5688732973215cda0db8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -309,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb9852308d5c9d7073352c6200799753d1f284b232f39720b8eff5b8bc2071c8",
+        "lastblockhash" : "0x63236786b090ab051082334b3a828d9a528f1cb3d91aae7afb87dde69915af70",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -369,8 +246,10 @@
     "callOutput3_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -381,9 +260,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x3eca4a9a185f35a0b123bf704b21aad6adb4d567200c8c94668d64299f457ac1",
-                    "mixHash" : "0x49cd228f894743894e002908da7d30e341d4453bc88c85fba41b89f3baa3f800",
-                    "nonce" : "0x74ebe5e5d4c49344",
+                    "hash" : "0x663aa89ee27b2d78ba9921e775e2c2ec048d3f2e5bad878a4538cb271a2e0093",
+                    "mixHash" : "0xc249f2be5497ea307ef1994607dab2861b141f283802e85a6f8e36284d8dd410",
+                    "nonce" : "0x9b9e7e7213c6d8a6",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x69551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115d",
@@ -392,7 +271,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a049cd228f894743894e002908da7d30e341d4453bc88c85fba41b89f3baa3f8008874ebe5e5d4c49344f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0c249f2be5497ea307ef1994607dab2861b141f283802e85a6f8e36284d8dd410889b9e7e7213c6d8a6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -429,7 +308,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3eca4a9a185f35a0b123bf704b21aad6adb4d567200c8c94668d64299f457ac1",
+        "lastblockhash" : "0x663aa89ee27b2d78ba9921e775e2c2ec048d3f2e5bad878a4538cb271a2e0093",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -489,8 +368,10 @@
     "callOutput3_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -501,9 +382,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0x524724ef14a510a684b9f40fda1f351c468c02ec568dff7c1dde079e7c2bdb74",
-                    "mixHash" : "0xf99d165a24a4c501db2ba6695fbe201acd03adc1961b9afe15ded8c46929962a",
-                    "nonce" : "0x2be623186eddcc44",
+                    "hash" : "0xb4ae57318368c456affbbd673383edcf9abeb9f242ba3e985979b64435503667",
+                    "mixHash" : "0xbfda2021390b83a8ffb15e63fd5c7076de848d74483cc87c8a3c0e246fb476f8",
+                    "nonce" : "0x6ffa0638ba98ba11",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x4e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585ac",
@@ -512,7 +393,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0f99d165a24a4c501db2ba6695fbe201acd03adc1961b9afe15ded8c46929962a882be623186eddcc44f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0bfda2021390b83a8ffb15e63fd5c7076de848d74483cc87c8a3c0e246fb476f8886ffa0638ba98ba11f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -549,7 +430,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x524724ef14a510a684b9f40fda1f351c468c02ec568dff7c1dde079e7c2bdb74",
+        "lastblockhash" : "0xb4ae57318368c456affbbd673383edcf9abeb9f242ba3e985979b64435503667",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -608,8 +489,10 @@
     "callOutput3_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -620,9 +503,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x427785748e46710dfbf1f2bdf648ed6fb53ff1f2d470c148d658bcac812d9812",
-                    "mixHash" : "0x518871e5e3519cc10f3fbe0f522e6f16c910b0c174449bcccdb9851cc2c2f534",
-                    "nonce" : "0xd3b15b839d147308",
+                    "hash" : "0x56ddcee741dba03b56e079b19bbde7c479424bde0c5617f96e2c64d23bd23a29",
+                    "mixHash" : "0xe104b6e17e0b2c9fcbf09fb4d9d9a32e13881d0aaab3eec3680e07fa64124755",
+                    "nonce" : "0xbe1b9b62baf4d15e",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0xf25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61",
@@ -631,7 +514,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0518871e5e3519cc10f3fbe0f522e6f16c910b0c174449bcccdb9851cc2c2f53488d3b15b839d147308f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0e104b6e17e0b2c9fcbf09fb4d9d9a32e13881d0aaab3eec3680e07fa6412475588be1b9b62baf4d15ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -668,7 +551,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x427785748e46710dfbf1f2bdf648ed6fb53ff1f2d470c148d658bcac812d9812",
+        "lastblockhash" : "0x56ddcee741dba03b56e079b19bbde7c479424bde0c5617f96e2c64d23bd23a29",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
index 870e42949..4b9dafe67 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
@@ -2,8 +2,10 @@
     "callOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xdd6a5910463313396c622e391438f22034e4139c1faeae0cad5b453e3b5e9d97",
-                    "mixHash" : "0xd5a4fd9e951bb713c8d7d298ce4bf7f665bae59003bf50f0b03ac5bf7cd27264",
-                    "nonce" : "0x433c0d0d73551bac",
+                    "hash" : "0xf15000a7dc27b51725ce42b19b2ed1d0144d260ef631249f77c2e8d6450f2907",
+                    "mixHash" : "0xe44ce774610b5a4b6379fbd1d8efe642b384db8c92597b38706556205eea6287",
+                    "nonce" : "0x51e740916ab7f1c0",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d5a4fd9e951bb713c8d7d298ce4bf7f665bae59003bf50f0b03ac5bf7cd2726488433c0d0d73551bacc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e44ce774610b5a4b6379fbd1d8efe642b384db8c92597b38706556205eea62878851e740916ab7f1c0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd6a5910463313396c622e391438f22034e4139c1faeae0cad5b453e3b5e9d97",
+        "lastblockhash" : "0xf15000a7dc27b51725ce42b19b2ed1d0144d260ef631249f77c2e8d6450f2907",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callOutput3partialFail_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xe380c4e1540293d58729255c899afebda6daf1e7a3cc9e285f973a9594af3aaa",
-                    "mixHash" : "0xe0e9753a62f50dd358fe701d17d0449ed1f8e985f10e6266349c3467f39a5301",
-                    "nonce" : "0xbf0ccc85d5ae4584",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xe893c90f6397a5a5184908f5cca0c5d6825ec606b7d6ef30ab7fa509b178a466",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e893c90f6397a5a5184908f5cca0c5d6825ec606b7d6ef30ab7fa509b178a466a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e0e9753a62f50dd358fe701d17d0449ed1f8e985f10e6266349c3467f39a530188bf0ccc85d5ae4584c0c0",
-                "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" : "0xe380c4e1540293d58729255c899afebda6daf1e7a3cc9e285f973a9594af3aaa",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa0d10b04d410353d594e67ddd36975ea28fe7c697316a113b770d5c6c9843a36",
-                    "mixHash" : "0x693b97c69900f62c92e83fa33ee5419c2c1c0152395ce83ceb8f5737ad415430",
-                    "nonce" : "0x4cdbc87dac570f8d",
+                    "hash" : "0xa494af1ddf031fcb95a29937d62f5acca45b14346fa4c6583435116bcbc01f6b",
+                    "mixHash" : "0x7c228c35acf91b0b858fd1828bbda73fb52395c0b1125f84cb0a313db2d0b61b",
+                    "nonce" : "0xa49b252e9651720a",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0693b97c69900f62c92e83fa33ee5419c2c1c0152395ce83ceb8f5737ad415430884cdbc87dac570f8dc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07c228c35acf91b0b858fd1828bbda73fb52395c0b1125f84cb0a313db2d0b61b88a49b252e9651720ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0d10b04d410353d594e67ddd36975ea28fe7c697316a113b770d5c6c9843a36",
+        "lastblockhash" : "0xa494af1ddf031fcb95a29937d62f5acca45b14346fa4c6583435116bcbc01f6b",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callOutput3partialFail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x91aa67ecd7b7e9c8db7142746ed5454ae062cb5a623439ddc8c4f04501e84062",
-                    "mixHash" : "0xb1fba2533eb2e5cdcf830d47eaaa4a2182125bb6b7f1dae1ebae33cf7fca3467",
-                    "nonce" : "0x24efc254fedc87ec",
+                    "hash" : "0xbd7536e883ac345c29cb6270abc16178844d63940816c740f0036d90cfdbdaeb",
+                    "mixHash" : "0xaea02536af2c156ba94d8eeae85b3f5087a4b49481d7568349a3a7a07fe4a170",
+                    "nonce" : "0x977e678d0cfbfd87",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b1fba2533eb2e5cdcf830d47eaaa4a2182125bb6b7f1dae1ebae33cf7fca34678824efc254fedc87ecc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0aea02536af2c156ba94d8eeae85b3f5087a4b49481d7568349a3a7a07fe4a17088977e678d0cfbfd87c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91aa67ecd7b7e9c8db7142746ed5454ae062cb5a623439ddc8c4f04501e84062",
+        "lastblockhash" : "0xbd7536e883ac345c29cb6270abc16178844d63940816c740f0036d90cfdbdaeb",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callOutput3partialFail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x499f2c759250e0b71453ed0a1bd789f16d068503ec89e87fc1bb081e43636f7b",
-                    "mixHash" : "0xd02b4623e99636ec5135c9a48ab059eaf9d1eb0ecae23daf384fd7c60d88c535",
-                    "nonce" : "0x06a81bc8b231521a",
+                    "hash" : "0x825b0236a8d682b8e609394f3be4e7691ee7c3dec69e83cb625102a9f8e1235a",
+                    "mixHash" : "0x02d20441bd14049615c78371a28301fdf762be6ad62eff2c6e05d5f5963c54de",
+                    "nonce" : "0x65903757d202dcd5",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d02b4623e99636ec5135c9a48ab059eaf9d1eb0ecae23daf384fd7c60d88c5358806a81bc8b231521ac0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a002d20441bd14049615c78371a28301fdf762be6ad62eff2c6e05d5f5963c54de8865903757d202dcd5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x499f2c759250e0b71453ed0a1bd789f16d068503ec89e87fc1bb081e43636f7b",
+        "lastblockhash" : "0x825b0236a8d682b8e609394f3be4e7691ee7c3dec69e83cb625102a9f8e1235a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callOutput3partialFail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x39afb98453077a843670021a2da8caf7091f99c6029a06c22acc6a6fe52c96ea",
-                    "mixHash" : "0xce4f82df2a636c94174cd59c5c567d744db18a23b9a518f895dff6d89c7b06b1",
-                    "nonce" : "0x4d4e20aec6abe564",
+                    "hash" : "0xee597c2192c48e964eb9deb5a2ca497547922843180c4b2e183d3ead397d8154",
+                    "mixHash" : "0xb0c1795925ee4001034819fddc54c02cd4b649a475c4d3ad27493394d8dc47eb",
+                    "nonce" : "0xcc4b15cf7d5826ca",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ce4f82df2a636c94174cd59c5c567d744db18a23b9a518f895dff6d89c7b06b1884d4e20aec6abe564c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b0c1795925ee4001034819fddc54c02cd4b649a475c4d3ad27493394d8dc47eb88cc4b15cf7d5826cac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39afb98453077a843670021a2da8caf7091f99c6029a06c22acc6a6fe52c96ea",
+        "lastblockhash" : "0xee597c2192c48e964eb9deb5a2ca497547922843180c4b2e183d3ead397d8154",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
index 5f261168f..883c4fd06 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
@@ -2,8 +2,10 @@
     "callOutput3partialFail_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x5b66ae3358bbc29dc9ea3fb1640c95b77a9f950d39eb8486d208cddda3053eb9",
-                    "mixHash" : "0x049de8ebd693b40d37fddc2205b99461afd6bafd76400be92c7623fcaf24aa9b",
-                    "nonce" : "0x493380bdaa278881",
+                    "hash" : "0x4ad8102e8904e11dd5657f97f3d9109678673df4a0d2b6d669d264194627e969",
+                    "mixHash" : "0xcd43438527657802ce76cd83e5536c91eba8843808c7d9c81737c9d2f6c5b147",
+                    "nonce" : "0x9d7e8abdfc609977",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064f6c7dc5dc0bbe41900673e806843a37451e8ac0e022903511f8f467733579aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0049de8ebd693b40d37fddc2205b99461afd6bafd76400be92c7623fcaf24aa9b88493380bdaa278881f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064f6c7dc5dc0bbe41900673e806843a37451e8ac0e022903511f8f467733579aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0cd43438527657802ce76cd83e5536c91eba8843808c7d9c81737c9d2f6c5b147889d7e8abdfc609977f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b66ae3358bbc29dc9ea3fb1640c95b77a9f950d39eb8486d208cddda3053eb9",
+        "lastblockhash" : "0x4ad8102e8904e11dd5657f97f3d9109678673df4a0d2b6d669d264194627e969",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -119,138 +121,13 @@
             }
         }
     },
-    "callOutput3partialFail_d0g1v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "0xa5eeea52dcd3fe3c7896d0982745fc2ee97eb5c268424f786ca1fb290f519ef1",
-                    "mixHash" : "0xfb751660f2c5405dc1bf68ce727ce6c2dd12c7077b3046822527d2cb15b0bba0",
-                    "nonce" : "0xb9b5161a1ddb0203",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
-                    "stateRoot" : "0xc692800ae0073996da2e28f0bf8865701834f8fa3192a48363845753c2cabfc2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c692800ae0073996da2e28f0bf8865701834f8fa3192a48363845753c2cabfc2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0fb751660f2c5405dc1bf68ce727ce6c2dd12c7077b3046822527d2cb15b0bba088b9b5161a1ddb0203f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "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" : "0xa5eeea52dcd3fe3c7896d0982745fc2ee97eb5c268424f786ca1fb290f519ef1",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -261,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x8f5e6fb6afcfea379bf3994165f36b6509c3990a82ebd4166f5d24f9e738df06",
-                    "mixHash" : "0x38c0f8d0ac4acd3b28bd5f4774f82531a00d43d4dd8e04ea3d6b7a53aa992350",
-                    "nonce" : "0x57502615bda70cb6",
+                    "hash" : "0x4ac555427daf537b98c253aedf5598aa301f3073833c40c5d2e89ee1977e4731",
+                    "mixHash" : "0x2408b7241b76c0f976edc724197f685cf0addb71463969d05daa091c1ef8284c",
+                    "nonce" : "0x077df9e76f3a8d68",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x7e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92",
@@ -272,7 +149,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a038c0f8d0ac4acd3b28bd5f4774f82531a00d43d4dd8e04ea3d6b7a53aa9923508857502615bda70cb6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a02408b7241b76c0f976edc724197f685cf0addb71463969d05daa091c1ef8284c88077df9e76f3a8d68f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -309,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f5e6fb6afcfea379bf3994165f36b6509c3990a82ebd4166f5d24f9e738df06",
+        "lastblockhash" : "0x4ac555427daf537b98c253aedf5598aa301f3073833c40c5d2e89ee1977e4731",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -369,8 +246,10 @@
     "callOutput3partialFail_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -381,9 +260,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0xa858d9fbcb40f0e0939fb37c463c2b67045f7d036fe388d1e5f39d9833f0e4df",
-                    "mixHash" : "0x24ae940e70426f5fac26f25c991527d62c969a84b1422f37565e210549dbcd83",
-                    "nonce" : "0x7e8a0a81ae36adf1",
+                    "hash" : "0x65e4e52cd95c9cc008e8f1c1d3aedc3816d453f95552dc386eec08f02d58281d",
+                    "mixHash" : "0xeab88fbc23018ee72dff27132dba701e6bf98847d25c23b96e4b2249c6b2e5a8",
+                    "nonce" : "0x2494373907d64a62",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x36fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7b",
@@ -392,7 +271,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a024ae940e70426f5fac26f25c991527d62c969a84b1422f37565e210549dbcd83887e8a0a81ae36adf1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0eab88fbc23018ee72dff27132dba701e6bf98847d25c23b96e4b2249c6b2e5a8882494373907d64a62f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -429,7 +308,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa858d9fbcb40f0e0939fb37c463c2b67045f7d036fe388d1e5f39d9833f0e4df",
+        "lastblockhash" : "0x65e4e52cd95c9cc008e8f1c1d3aedc3816d453f95552dc386eec08f02d58281d",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -489,8 +368,10 @@
     "callOutput3partialFail_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -501,9 +382,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0x1268e6e8e4c123adb73644de67ff377bb81d1d313688b63b21bd3147073e9a6f",
-                    "mixHash" : "0x12100ac1703d225c9fa05160ee0d45e3c59057c08b372040c339574b3bf8f962",
-                    "nonce" : "0x4fa324552c6fdd1b",
+                    "hash" : "0x4df11645edb7b78f766bc951e4ee2408366470e8053b73b05e0366816fc51bda",
+                    "mixHash" : "0x2845ee2535e27e957bc020a688923f5d2931fb5a05b5ec4935bddb5b92366e0f",
+                    "nonce" : "0xa00c2597d842ce2c",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x7693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ff",
@@ -512,7 +393,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a012100ac1703d225c9fa05160ee0d45e3c59057c08b372040c339574b3bf8f962884fa324552c6fdd1bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a02845ee2535e27e957bc020a688923f5d2931fb5a05b5ec4935bddb5b92366e0f88a00c2597d842ce2cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -549,7 +430,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1268e6e8e4c123adb73644de67ff377bb81d1d313688b63b21bd3147073e9a6f",
+        "lastblockhash" : "0x4df11645edb7b78f766bc951e4ee2408366470e8053b73b05e0366816fc51bda",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -608,8 +489,10 @@
     "callOutput3partialFail_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -620,9 +503,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163c9",
-                    "hash" : "0x5a1b6a2a850ba20f397dcbdc435d8c5b5331e375207c069f4b4661cfac872689",
-                    "mixHash" : "0x1c1adc6dd7d0216b4fdc25e2b148d6bcb439bbe6a9b2a74c7b2548d0ec34dd84",
-                    "nonce" : "0xe7233b6d9b6244cf",
+                    "hash" : "0xfcee9c72ef83966383ea80d3efb68bfc94caad05980071ebecf2e34a32347c41",
+                    "mixHash" : "0x01d6130c9732931f870e9d2967910959922986e370ccd409d9f998fc6748b214",
+                    "nonce" : "0x3cd711c459ef0c76",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4",
@@ -631,7 +514,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a01c1adc6dd7d0216b4fdc25e2b148d6bcb439bbe6a9b2a74c7b2548d0ec34dd8488e7233b6d9b6244cff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a001d6130c9732931f870e9d2967910959922986e370ccd409d9f998fc6748b214883cd711c459ef0c76f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -668,7 +551,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a1b6a2a850ba20f397dcbdc435d8c5b5331e375207c069f4b4661cfac872689",
+        "lastblockhash" : "0xfcee9c72ef83966383ea80d3efb68bfc94caad05980071ebecf2e34a32347c41",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
index 39c219c28..1be3d2ab1 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
@@ -2,8 +2,10 @@
     "callOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x740b3df82fba2ed8eac734e0712712e9dbfdb4a737dc852382652fc3b569e6b0",
-                    "mixHash" : "0x97f03b821bde7f5635fff24a5a1ed500239c22617874550f1d6a334b9be78d7b",
-                    "nonce" : "0x9da44990a731782e",
+                    "hash" : "0xd1776e042dfc898899ed48b92e8008fa15c00a861aa73fa938ec8f0460039068",
+                    "mixHash" : "0x43eae9e3a8e541c16f5778786d6ab0b79d35f0aa9ced80901bf1cec963fd812a",
+                    "nonce" : "0x451d6679809fd97f",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a097f03b821bde7f5635fff24a5a1ed500239c22617874550f1d6a334b9be78d7b889da44990a731782ec0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a043eae9e3a8e541c16f5778786d6ab0b79d35f0aa9ced80901bf1cec963fd812a88451d6679809fd97fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x740b3df82fba2ed8eac734e0712712e9dbfdb4a737dc852382652fc3b569e6b0",
+        "lastblockhash" : "0xd1776e042dfc898899ed48b92e8008fa15c00a861aa73fa938ec8f0460039068",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callOutput3partial_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xd763e9376403915aa6f8931417025080d313c74e7f85b77eea89d20c4cc575a9",
-                    "mixHash" : "0x64a98ea17b19c2e326d5b69f98039ee89d0c6ad96454d09d0b36284e7153bfe0",
-                    "nonce" : "0xd7540ae2792bd094",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xaf67dd2c08eb95b3196292d9137020e57a22ad3e9301191205709b34c0c19fae",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af67dd2c08eb95b3196292d9137020e57a22ad3e9301191205709b34c0c19faea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a064a98ea17b19c2e326d5b69f98039ee89d0c6ad96454d09d0b36284e7153bfe088d7540ae2792bd094c0c0",
-                "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" : "0xd763e9376403915aa6f8931417025080d313c74e7f85b77eea89d20c4cc575a9",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xff0b3d92823460fe4bb8c3ff6349b11baeebab4619f65524fcfbf672ca97b009",
-                    "mixHash" : "0xd30f1af4bca6fcfe65295de63cc9ecaf13eaf6830b36128f2da1374b45b62467",
-                    "nonce" : "0x630e961a901b14f1",
+                    "hash" : "0x77362845a94abae66135d0a41f73e9ef55692186fa323fa63faa9b4cea8fa5cc",
+                    "mixHash" : "0x37fc306afdced2e2bbe52052f4823562cb98796e9c3ffc4c75e0aac2d57f3ac9",
+                    "nonce" : "0x7ae8b6f020c39851",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d30f1af4bca6fcfe65295de63cc9ecaf13eaf6830b36128f2da1374b45b6246788630e961a901b14f1c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a037fc306afdced2e2bbe52052f4823562cb98796e9c3ffc4c75e0aac2d57f3ac9887ae8b6f020c39851c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff0b3d92823460fe4bb8c3ff6349b11baeebab4619f65524fcfbf672ca97b009",
+        "lastblockhash" : "0x77362845a94abae66135d0a41f73e9ef55692186fa323fa63faa9b4cea8fa5cc",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callOutput3partial_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x37dc7d29499497624ff9fe2f7b3eacd39f643415682b37fd99dbf64f27a7d61b",
-                    "mixHash" : "0x5ebad798fba3739ce7cf2c156088db0a24ebd0aa6303c9589e40d36b63a0f2de",
-                    "nonce" : "0x350222d1a94105cf",
+                    "hash" : "0xcccad26e27f314ee13345deb301d8a010ccd0000c21f254c97dfa42252679964",
+                    "mixHash" : "0xaf6d8d0e7e4ebf1a5295da2e682d7ae2ad997af57d0657d7ef6b50fee56c3c33",
+                    "nonce" : "0x1663976cf12196f9",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05ebad798fba3739ce7cf2c156088db0a24ebd0aa6303c9589e40d36b63a0f2de88350222d1a94105cfc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0af6d8d0e7e4ebf1a5295da2e682d7ae2ad997af57d0657d7ef6b50fee56c3c33881663976cf12196f9c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37dc7d29499497624ff9fe2f7b3eacd39f643415682b37fd99dbf64f27a7d61b",
+        "lastblockhash" : "0xcccad26e27f314ee13345deb301d8a010ccd0000c21f254c97dfa42252679964",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callOutput3partial_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x64598c8dda6e0db88fb6d6be11171efec70d7cd969e1b98c4cef9b9fa5dfe1a9",
-                    "mixHash" : "0x0d5268bd6007803f092b23ad4a06117fdcabb5801de15c37aa60057e9f6e1952",
-                    "nonce" : "0x8c4f5906c02bed3b",
+                    "hash" : "0x72ab2bbc7a21ee5396f4a659155be97a3ec1ce7ad1f5705587535abd80d56b6b",
+                    "mixHash" : "0x1313e786c91bc0968cb5db4bb8be890b883346c240c613f45f165ca4470e281c",
+                    "nonce" : "0x6f278f36368353b1",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00d5268bd6007803f092b23ad4a06117fdcabb5801de15c37aa60057e9f6e1952888c4f5906c02bed3bc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01313e786c91bc0968cb5db4bb8be890b883346c240c613f45f165ca4470e281c886f278f36368353b1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x64598c8dda6e0db88fb6d6be11171efec70d7cd969e1b98c4cef9b9fa5dfe1a9",
+        "lastblockhash" : "0x72ab2bbc7a21ee5396f4a659155be97a3ec1ce7ad1f5705587535abd80d56b6b",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callOutput3partial_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x082929eacea06c454191aa5f2a19ca04a9c0a88029b0d031228ed5164bdeed4f",
-                    "mixHash" : "0xb0b343a49ac295ddad74ac2d8cdd9b47388966fc97ed7e1d93e52aaebdd0ba70",
-                    "nonce" : "0x5709dee0c019a419",
+                    "hash" : "0x61427ebae7800910bdee1e2ea01fa12f669b9630deb8ba0ad2dd62beb14c8442",
+                    "mixHash" : "0x4bd8b4ae18bb04a641194bd15bc22b8ae97b82fc75d61aa500e25221a5ac1fdf",
+                    "nonce" : "0x78fae86c04445d70",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b0b343a49ac295ddad74ac2d8cdd9b47388966fc97ed7e1d93e52aaebdd0ba70885709dee0c019a419c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04bd8b4ae18bb04a641194bd15bc22b8ae97b82fc75d61aa500e25221a5ac1fdf8878fae86c04445d70c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x082929eacea06c454191aa5f2a19ca04a9c0a88029b0d031228ed5164bdeed4f",
+        "lastblockhash" : "0x61427ebae7800910bdee1e2ea01fa12f669b9630deb8ba0ad2dd62beb14c8442",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
index 4100635c8..eeaefa4ff 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
@@ -2,8 +2,10 @@
     "callOutput3partial_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xf9f1e20b9268e24ada6975348b6d4a1512c9e7608b36f7533d3bf0867c422a82",
-                    "mixHash" : "0x34aa38f00e2202e924c8753e43b4513f2bac9704d1f6a6af5e7a37082c20b07a",
-                    "nonce" : "0xda9339d05531c963",
+                    "hash" : "0x8a8f8ab76305b6f9066fbf58947035bb2a3793f64eb7a629f8cb6337230b4215",
+                    "mixHash" : "0x621d6c21b306d3f14d19c8572e8bd3125987b1740827321745f81967a7126048",
+                    "nonce" : "0xe8d97a8585714a2d",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c50ef7cdfede30353ca0a2e5583a77eceb64a69a38b9b54b2c345d478fc61aea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a034aa38f00e2202e924c8753e43b4513f2bac9704d1f6a6af5e7a37082c20b07a88da9339d05531c963f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c50ef7cdfede30353ca0a2e5583a77eceb64a69a38b9b54b2c345d478fc61aea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0621d6c21b306d3f14d19c8572e8bd3125987b1740827321745f81967a712604888e8d97a8585714a2df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9f1e20b9268e24ada6975348b6d4a1512c9e7608b36f7533d3bf0867c422a82",
+        "lastblockhash" : "0x8a8f8ab76305b6f9066fbf58947035bb2a3793f64eb7a629f8cb6337230b4215",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -119,138 +121,13 @@
             }
         }
     },
-    "callOutput3partial_d0g1v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0xdf38a4f01f11961e9b2ccc233ed5984081c8b34ea758d1310b844b6e9e7f1b37",
-                    "mixHash" : "0xe0c9ec57960c9d4be3d14360f3eff66d4a2582d6fc8c580f59bc5c3858ec16b3",
-                    "nonce" : "0x7199e5b13ba9db2c",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xf739aeb44dee748d27ea475351b9d598a31faf737cca42b1b2b157f9fdf11785",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f739aeb44dee748d27ea475351b9d598a31faf737cca42b1b2b157f9fdf11785a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0e0c9ec57960c9d4be3d14360f3eff66d4a2582d6fc8c580f59bc5c3858ec16b3887199e5b13ba9db2cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "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" : "0xdf38a4f01f11961e9b2ccc233ed5984081c8b34ea758d1310b844b6e9e7f1b37",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -261,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x442b9aece9ba8c8635e459ee17160a9ff7db54000102b5dda7432aac653e2da9",
-                    "mixHash" : "0xa64c1eb3214ab18384eb5d53addb1331e915ab89ba2ef697e316b3db503bac55",
-                    "nonce" : "0xef3f274bbacc6286",
+                    "hash" : "0x29f638c70bba77bf883b21bd1f8498584d84e5baa62a1a094422a550a041e572",
+                    "mixHash" : "0xf2eea358de89e34f88b671e26c171aae069ec43fffeec3ea7c8c69e79ed793b2",
+                    "nonce" : "0x8b3732bdd2502a76",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2de",
@@ -272,7 +149,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0a64c1eb3214ab18384eb5d53addb1331e915ab89ba2ef697e316b3db503bac5588ef3f274bbacc6286f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0f2eea358de89e34f88b671e26c171aae069ec43fffeec3ea7c8c69e79ed793b2888b3732bdd2502a76f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -309,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x442b9aece9ba8c8635e459ee17160a9ff7db54000102b5dda7432aac653e2da9",
+        "lastblockhash" : "0x29f638c70bba77bf883b21bd1f8498584d84e5baa62a1a094422a550a041e572",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -369,8 +246,10 @@
     "callOutput3partial_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -381,9 +260,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xc716f680e320e8ce465b788161923493f03a671e6bfd44a92cdff67b90645606",
-                    "mixHash" : "0x70988a0bb2d40c04281cb5bac2e6b71a10b7eae6a9e269a0efa92362bf2fe2a3",
-                    "nonce" : "0x5964a2ef965f9e04",
+                    "hash" : "0xf88004066fe405b62b74bc514035ca9964534744ee57e694b11ec60fdb5413d5",
+                    "mixHash" : "0xb029009ff770ee80e2478064a73856b1591ff68362bcb599f95ca7693b5d703e",
+                    "nonce" : "0xe33ea38157e07a29",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x9ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198f",
@@ -392,7 +271,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a070988a0bb2d40c04281cb5bac2e6b71a10b7eae6a9e269a0efa92362bf2fe2a3885964a2ef965f9e04f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0b029009ff770ee80e2478064a73856b1591ff68362bcb599f95ca7693b5d703e88e33ea38157e07a29f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -429,7 +308,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc716f680e320e8ce465b788161923493f03a671e6bfd44a92cdff67b90645606",
+        "lastblockhash" : "0xf88004066fe405b62b74bc514035ca9964534744ee57e694b11ec60fdb5413d5",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -489,8 +368,10 @@
     "callOutput3partial_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -501,9 +382,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0x5cbf6b2a1b0db27361c69925ce97b9d98da3997930a2236e07c3d901ea9a519d",
-                    "mixHash" : "0xb687dd25ee6f761787b4afc39f478137a39ed53b1ea67ebd06ebb3539e65224a",
-                    "nonce" : "0x03fcd95a05e555f5",
+                    "hash" : "0x73316b7b2f5206952d36ff786a2d936a4e91f21ab1780a346daa9a7abadaa6c6",
+                    "mixHash" : "0x019869fb1126737f5747b0d21b906367d6f176da8140243f8da4493c8530a40b",
+                    "nonce" : "0x936a512235d37728",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x8fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316",
@@ -512,7 +393,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0b687dd25ee6f761787b4afc39f478137a39ed53b1ea67ebd06ebb3539e65224a8803fcd95a05e555f5f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0019869fb1126737f5747b0d21b906367d6f176da8140243f8da4493c8530a40b88936a512235d37728f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -549,7 +430,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cbf6b2a1b0db27361c69925ce97b9d98da3997930a2236e07c3d901ea9a519d",
+        "lastblockhash" : "0x73316b7b2f5206952d36ff786a2d936a4e91f21ab1780a346daa9a7abadaa6c6",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -608,8 +489,10 @@
     "callOutput3partial_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -620,9 +503,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x1d7cfff30212852612f537a45fe57f51d7b53e7e838ff24f015c0fd67cbe5a0b",
-                    "mixHash" : "0x3952f0460f3b60a5a4fbf62f6f680910efbc4d474706db3fa7e1b8f50eb37fd2",
-                    "nonce" : "0xd8d256fe785aebce",
+                    "hash" : "0x7e646882cc53f64e0a0f99933f06d240030d754903b328aae236ec9f798315e8",
+                    "mixHash" : "0xeef7233c74f51b4db011e74f0ef58d06b3539144332cd1e01a2941820cf1f7af",
+                    "nonce" : "0x622659f7be22402d",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258a",
@@ -631,7 +514,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a03952f0460f3b60a5a4fbf62f6f680910efbc4d474706db3fa7e1b8f50eb37fd288d8d256fe785aebcef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0eef7233c74f51b4db011e74f0ef58d06b3539144332cd1e01a2941820cf1f7af88622659f7be22402df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -668,7 +551,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d7cfff30212852612f537a45fe57f51d7b53e7e838ff24f015c0fd67cbe5a0b",
+        "lastblockhash" : "0x7e646882cc53f64e0a0f99933f06d240030d754903b328aae236ec9f798315e8",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
index 7f7ffbebe..71670d721 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
@@ -2,8 +2,10 @@
     "callWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x1dab955a7a06b24118cfd75a12166f05f3c33fa60dd4be3455a694bcf643add3",
-                    "mixHash" : "0xec7cffab43876a6bc8d7b1f38549fcafe60faa3ccbd407c9e9c675e5de34b4b6",
-                    "nonce" : "0x33aa6f4044848945",
+                    "hash" : "0x163b9e8fcdaba50fab8a4aad6aa2f869083b17da4c696eccc8819b5195e2ac02",
+                    "mixHash" : "0xb1e786abbf94bafbd37b7e6ec1f462e66155a8364eb5e9940ff5cf77ffe4f7c0",
+                    "nonce" : "0x53ceb061f95c1bcc",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0ec7cffab43876a6bc8d7b1f38549fcafe60faa3ccbd407c9e9c675e5de34b4b68833aa6f4044848945f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0b1e786abbf94bafbd37b7e6ec1f462e66155a8364eb5e9940ff5cf77ffe4f7c08853ceb061f95c1bccf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1dab955a7a06b24118cfd75a12166f05f3c33fa60dd4be3455a694bcf643add3",
+        "lastblockhash" : "0x163b9e8fcdaba50fab8a4aad6aa2f869083b17da4c696eccc8819b5195e2ac02",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "callWithHighValueAndGasOOG_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0xc97814ce2d927c5d913654865e1037bb9ccf7e6ac3b2574fd677f188985759b5",
-                    "mixHash" : "0xe99788fe2d829e05b6591557b72b5cd591dec42e4997bdac158efa62a73af281",
-                    "nonce" : "0xc720320e6356ed80",
-                    "number" : "0x01",
-                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x500558d0462adb9431982bc7e431d2c767ac3e9f53a1135dce43b8f5c65aa7e2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0500558d0462adb9431982bc7e431d2c767ac3e9f53a1135dce43b8f5c65aa7e2a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0e99788fe2d829e05b6591557b72b5cd591dec42e4997bdac158efa62a73af28188c720320e6356ed80f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "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" : "0xc97814ce2d927c5d913654865e1037bb9ccf7e6ac3b2574fd677f188985759b5",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cf149",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x0f01e683c486313a739920512d94e92d3f037c6284e5c31841897f99246041c1",
-                    "mixHash" : "0xc5bbe2005d31ca58e756ae163a339b53d7aafec8e6be9b551748f586c9c721e5",
-                    "nonce" : "0x29b8441331f19fd3",
+                    "hash" : "0x01928c4f08bc50a69fdc104dba52af318e148bb355b4de987574ec3ea5e6c4cf",
+                    "mixHash" : "0x0c565b9d22a8c6a5be5cd86bd1c62095f6f8912f27e950904a7b4bb1774c1240",
+                    "nonce" : "0xb9a8e6e1068fcf0c",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0c5bbe2005d31ca58e756ae163a339b53d7aafec8e6be9b551748f586c9c721e58829b8441331f19fd3f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a00c565b9d22a8c6a5be5cd86bd1c62095f6f8912f27e950904a7b4bb1774c124088b9a8e6e1068fcf0cf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f01e683c486313a739920512d94e92d3f037c6284e5c31841897f99246041c1",
+        "lastblockhash" : "0x01928c4f08bc50a69fdc104dba52af318e148bb355b4de987574ec3ea5e6c4cf",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -372,8 +248,10 @@
     "callWithHighValueAndGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x1b31479f9680f77f315199114cbbc5874106bad2519d740eddc10c702c8a3c78",
-                    "mixHash" : "0x56e30217c6c55f1b55ce5efe71965037be133d5d30ae8391a4024190856df6bd",
-                    "nonce" : "0xafdc74ca2cce86cb",
+                    "hash" : "0xb8bf8419f79bcc23cf5f4bb689df4b54cca5828e4871333d893e94c9f4338202",
+                    "mixHash" : "0x69c538eabb6c38758a1c783f2097e68bced282ea04e2004760ee5ca047318c95",
+                    "nonce" : "0x87c1f5f9eac08a9f",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a056e30217c6c55f1b55ce5efe71965037be133d5d30ae8391a4024190856df6bd88afdc74ca2cce86cbf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a069c538eabb6c38758a1c783f2097e68bced282ea04e2004760ee5ca047318c958887c1f5f9eac08a9ff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b31479f9680f77f315199114cbbc5874106bad2519d740eddc10c702c8a3c78",
+        "lastblockhash" : "0xb8bf8419f79bcc23cf5f4bb689df4b54cca5828e4871333d893e94c9f4338202",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -493,8 +371,10 @@
     "callWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x860156e47c88d9f1406e8952ff3c40be30dfa0afb8a4af6d7930d3c3bfdb6c5b",
-                    "mixHash" : "0xfb1637bf0eff24fa3ac1f4d325b4f2a41593b1e1a2e87a7d8d8ce8ac576455c9",
-                    "nonce" : "0xb1d14578c1485db3",
+                    "hash" : "0xfa77f086a0a1292fcecb07b3b05451be9ae14099bd1a019a3680607d95826040",
+                    "mixHash" : "0x407b4494dd41d19fa7a8b50b6fdbf9fd6f6879f55fb6aab221ab6d598d927f18",
+                    "nonce" : "0x2e637451c6b8764e",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0fb1637bf0eff24fa3ac1f4d325b4f2a41593b1e1a2e87a7d8d8ce8ac576455c988b1d14578c1485db3f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0407b4494dd41d19fa7a8b50b6fdbf9fd6f6879f55fb6aab221ab6d598d927f18882e637451c6b8764ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x860156e47c88d9f1406e8952ff3c40be30dfa0afb8a4af6d7930d3c3bfdb6c5b",
+        "lastblockhash" : "0xfa77f086a0a1292fcecb07b3b05451be9ae14099bd1a019a3680607d95826040",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -612,8 +492,10 @@
     "callWithHighValueAndGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x95dbf4f3e915713ee06a099b47b09e343b4ff6f77069e9b51eeac3d229c353dc",
-                    "mixHash" : "0x6eb4e21f23ab4631212855e9f3514a399456f8cac08c578fca6c8a1b4eda5c23",
-                    "nonce" : "0x65840a8c6b37c1bf",
+                    "hash" : "0xe1b0d202b6a20f46853469512ef4173bbf233f4ef301ee4906d253e9c52de01f",
+                    "mixHash" : "0xef0c80376b9e7c5397867e86b6aeb14b82fbcd74b23799d1bbbf9883b7f1396f",
+                    "nonce" : "0xd657f8c2094073a8",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a06eb4e21f23ab4631212855e9f3514a399456f8cac08c578fca6c8a1b4eda5c238865840a8c6b37c1bff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ef0c80376b9e7c5397867e86b6aeb14b82fbcd74b23799d1bbbf9883b7f1396f88d657f8c2094073a8f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95dbf4f3e915713ee06a099b47b09e343b4ff6f77069e9b51eeac3d229c353dc",
+        "lastblockhash" : "0xe1b0d202b6a20f46853469512ef4173bbf233f4ef301ee4906d253e9c52de01f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
index 1499a13ce..0bf6c5447 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
@@ -2,8 +2,10 @@
     "callcodeOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf0aea97b17ccedc3246a42fd76f2dc9c9366870e7c4dc0824667a4d8825e9fc2",
-                    "mixHash" : "0x51bf5bde017eddcd4a1b06cfc8bb686af74b373bbb66a3e8100855f91cef0440",
-                    "nonce" : "0xf61a60a404a6bdb0",
+                    "hash" : "0x77b7af24ae944873704b7f0f5ed46ca726f760859a59584bef6233d554cfc087",
+                    "mixHash" : "0xae658795ca393bbc96739512454af51d9ee7fb4c591a0026d2cb4e0526336700",
+                    "nonce" : "0x41483a5f8e99a162",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a051bf5bde017eddcd4a1b06cfc8bb686af74b373bbb66a3e8100855f91cef044088f61a60a404a6bdb0c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ae658795ca393bbc96739512454af51d9ee7fb4c591a0026d2cb4e05263367008841483a5f8e99a162c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0aea97b17ccedc3246a42fd76f2dc9c9366870e7c4dc0824667a4d8825e9fc2",
+        "lastblockhash" : "0x77b7af24ae944873704b7f0f5ed46ca726f760859a59584bef6233d554cfc087",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callcodeOutput1_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xaef4949088623483f9b19137de9134531a45cd5191b1ef1d4dffbc664ee0b0c2",
-                    "mixHash" : "0x9cb347522e3c49b62b33524503431e5d1a345ac9ae5bb1fd285ccf5584a8c9c2",
-                    "nonce" : "0x4fcffd8ef02f92ed",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x7c068bacc799d098ee92cbc0591e2e69f87e3470ce03e20c62cdbdceac462aeb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c068bacc799d098ee92cbc0591e2e69f87e3470ce03e20c62cdbdceac462aeba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09cb347522e3c49b62b33524503431e5d1a345ac9ae5bb1fd285ccf5584a8c9c2884fcffd8ef02f92edc0c0",
-                "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" : "0xaef4949088623483f9b19137de9134531a45cd5191b1ef1d4dffbc664ee0b0c2",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2103a403840acb9341ca174b42782451312ee475acaf0d55860773c743a50436",
-                    "mixHash" : "0x8dcebfd2f4df52a115e13dd9db17192e67ac373e73ecb254412861ee93d668cb",
-                    "nonce" : "0xa6dff892163bdc6d",
+                    "hash" : "0x995eeec45aa9e06d1551e58729421216b6cd85c165a79ea1a3ba840db80dbe53",
+                    "mixHash" : "0xa88398fe50b8b9d95c21a6981911df0777b03292b43d08edc506d0f9d1a0c807",
+                    "nonce" : "0x492d4a3fdfd4691f",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08dcebfd2f4df52a115e13dd9db17192e67ac373e73ecb254412861ee93d668cb88a6dff892163bdc6dc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a88398fe50b8b9d95c21a6981911df0777b03292b43d08edc506d0f9d1a0c80788492d4a3fdfd4691fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2103a403840acb9341ca174b42782451312ee475acaf0d55860773c743a50436",
+        "lastblockhash" : "0x995eeec45aa9e06d1551e58729421216b6cd85c165a79ea1a3ba840db80dbe53",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callcodeOutput1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xdf3340439204659ef9de9a269877e17b243064b300fe5d66e8a9eac9bd09ec12",
-                    "mixHash" : "0x29df693a2269b90492be0710d1dadfb85d95db6f00bc129639ebd267ac5a613d",
-                    "nonce" : "0x23637ed839e2e983",
+                    "hash" : "0xfd0a6a1db9a187a298241abfca556db99f7f482b89ddc14877eb8d385622b59e",
+                    "mixHash" : "0xbd453e17a2336df2628f41cb8f033a3b4f848c13fa0b622733ea683e471ca808",
+                    "nonce" : "0x5642f44b7d4ff11f",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a029df693a2269b90492be0710d1dadfb85d95db6f00bc129639ebd267ac5a613d8823637ed839e2e983c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bd453e17a2336df2628f41cb8f033a3b4f848c13fa0b622733ea683e471ca808885642f44b7d4ff11fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf3340439204659ef9de9a269877e17b243064b300fe5d66e8a9eac9bd09ec12",
+        "lastblockhash" : "0xfd0a6a1db9a187a298241abfca556db99f7f482b89ddc14877eb8d385622b59e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callcodeOutput1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x38d2d6510a4a237157f6c134ab06efb0c8012f5c56422f3d3dd77d53fa806681",
-                    "mixHash" : "0x35867eaade0cfa5f21dd73faf2555dbf46b0752fee59f6d6f60d3dfabca7573c",
-                    "nonce" : "0x6ccb7fff35cb3e44",
+                    "hash" : "0x6d6029f7bab8e44c70d3cd18fe9c499e1c526b2d2a7c6e4975ce7664f48351f5",
+                    "mixHash" : "0x21ef22af2b857f1e768d15ad503a63bbbe3be6f627c1f070dec7210b454b857c",
+                    "nonce" : "0x28ea101f04772103",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a035867eaade0cfa5f21dd73faf2555dbf46b0752fee59f6d6f60d3dfabca7573c886ccb7fff35cb3e44c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a021ef22af2b857f1e768d15ad503a63bbbe3be6f627c1f070dec7210b454b857c8828ea101f04772103c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38d2d6510a4a237157f6c134ab06efb0c8012f5c56422f3d3dd77d53fa806681",
+        "lastblockhash" : "0x6d6029f7bab8e44c70d3cd18fe9c499e1c526b2d2a7c6e4975ce7664f48351f5",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callcodeOutput1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x795857cc35902d415b02017a1ff6cf51f07340fe2595d4aae15aa96d4fc7c336",
-                    "mixHash" : "0x43ab42b5484e3fb08b3f150fa804025bcbd3280b43d114d532dab0f3b559223c",
-                    "nonce" : "0x1631a800dd59c0b2",
+                    "hash" : "0x195ab1a0eb18c9da80667d69deb3fdf20101009c7e1ec99121caaf0500bbcb75",
+                    "mixHash" : "0x824f5a336350b769d3b1ac560aba073aede6a9f71765a7f9c1025c4b554926db",
+                    "nonce" : "0x3ba854c1210b635c",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a043ab42b5484e3fb08b3f150fa804025bcbd3280b43d114d532dab0f3b559223c881631a800dd59c0b2c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0824f5a336350b769d3b1ac560aba073aede6a9f71765a7f9c1025c4b554926db883ba854c1210b635cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x795857cc35902d415b02017a1ff6cf51f07340fe2595d4aae15aa96d4fc7c336",
+        "lastblockhash" : "0x195ab1a0eb18c9da80667d69deb3fdf20101009c7e1ec99121caaf0500bbcb75",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
index ca86d8764..8cdb62a36 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
@@ -2,8 +2,10 @@
     "callcodeOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd6e055d6b838af310974c3ae77fd88cce84949239e6c58a60e8ac9342aff2bfe",
-                    "mixHash" : "0xef6832da4de94c605da90dbfd1549b035a3cc1efcffb3e2913dacb2df651d566",
-                    "nonce" : "0x96084a61e7a22921",
+                    "hash" : "0xc0967b29187b80b5d7e84d063abc9ae3f2bf6ef4cfcac9df8af9c42ec4472a5b",
+                    "mixHash" : "0x0bd024321077e45c59cdc51098b5759df876295d5b7a897c341297e0ab93ed91",
+                    "nonce" : "0xfe4fd6f305a03f6e",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ef6832da4de94c605da90dbfd1549b035a3cc1efcffb3e2913dacb2df651d5668896084a61e7a22921c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00bd024321077e45c59cdc51098b5759df876295d5b7a897c341297e0ab93ed9188fe4fd6f305a03f6ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd6e055d6b838af310974c3ae77fd88cce84949239e6c58a60e8ac9342aff2bfe",
+        "lastblockhash" : "0xc0967b29187b80b5d7e84d063abc9ae3f2bf6ef4cfcac9df8af9c42ec4472a5b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xa9ca17324e520198f3b6e64684e82d45684dfced4b61cab70007a15161a5066e",
-                    "mixHash" : "0x2a718307adce0a2d819950794479c72304dde7c26fca8af7bf17102c7538e6eb",
-                    "nonce" : "0xd39aab0bff75a069",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xecccc7d3a7b118766c9d9ae47663f70e1d71e25e1e1298a5c343c6ded93a05ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecccc7d3a7b118766c9d9ae47663f70e1d71e25e1e1298a5c343c6ded93a05eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02a718307adce0a2d819950794479c72304dde7c26fca8af7bf17102c7538e6eb88d39aab0bff75a069c0c0",
-                "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" : "0xa9ca17324e520198f3b6e64684e82d45684dfced4b61cab70007a15161a5066e",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc23b4eedca1d9a625587d468bc98677c411fc87439c057f7d5e5797a7282c68d",
-                    "mixHash" : "0xdaa8348beb95818519d40956aa3df45b0662850cbc5e79ebc129fa8f66908cbc",
-                    "nonce" : "0x2c279530b9b36d63",
+                    "hash" : "0xe02c1f40f43ec481ef4f2f5b16c30efa441e1871914eb1c98be8e8539493cbc6",
+                    "mixHash" : "0x07e514d7e366d5122990373be42ff36916f668ca4607dfa5b28470a8c9d45a85",
+                    "nonce" : "0xdb52f628db720f5b",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0daa8348beb95818519d40956aa3df45b0662850cbc5e79ebc129fa8f66908cbc882c279530b9b36d63c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a007e514d7e366d5122990373be42ff36916f668ca4607dfa5b28470a8c9d45a8588db52f628db720f5bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc23b4eedca1d9a625587d468bc98677c411fc87439c057f7d5e5797a7282c68d",
+        "lastblockhash" : "0xe02c1f40f43ec481ef4f2f5b16c30efa441e1871914eb1c98be8e8539493cbc6",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callcodeOutput2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3b71d6ce30f601a3b787dedcd20969efd006431a84a0e52a861f3cf2f88c5002",
-                    "mixHash" : "0x58dd1c687d9abb6952075c4324758373674fe5c1bed88681f288409be7491b31",
-                    "nonce" : "0x49669670097d7b9a",
+                    "hash" : "0x6233fc5a802449f237cf3d9d14672d92944812aa7ec4940267308649b852d7da",
+                    "mixHash" : "0xa3025180ddd5689c1623806023e29936ff60be2d4fc3e50af951de212e1839a9",
+                    "nonce" : "0x82966cf980415212",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a058dd1c687d9abb6952075c4324758373674fe5c1bed88681f288409be7491b318849669670097d7b9ac0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a3025180ddd5689c1623806023e29936ff60be2d4fc3e50af951de212e1839a98882966cf980415212c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b71d6ce30f601a3b787dedcd20969efd006431a84a0e52a861f3cf2f88c5002",
+        "lastblockhash" : "0x6233fc5a802449f237cf3d9d14672d92944812aa7ec4940267308649b852d7da",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callcodeOutput2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd718c1ae531a6393a2a8a55a3bbc8fdc1d99db1f468111ba7a01c25ca9505565",
-                    "mixHash" : "0xa31f688401ee928d389d02e1473889714cf5be6a06771c4db3886d430280f04d",
-                    "nonce" : "0xe28f789e91ea1de5",
+                    "hash" : "0x4934362cc4feb524a1e63cce8dcac8f476deab59cdfbd11b46e3e3eb56156a98",
+                    "mixHash" : "0xd6071a43c10cf6a4342c8d8b4c5c02357a02e25dcc1c79adda61e0f22376a2cd",
+                    "nonce" : "0x5fef82d250820c83",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a31f688401ee928d389d02e1473889714cf5be6a06771c4db3886d430280f04d88e28f789e91ea1de5c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d6071a43c10cf6a4342c8d8b4c5c02357a02e25dcc1c79adda61e0f22376a2cd885fef82d250820c83c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd718c1ae531a6393a2a8a55a3bbc8fdc1d99db1f468111ba7a01c25ca9505565",
+        "lastblockhash" : "0x4934362cc4feb524a1e63cce8dcac8f476deab59cdfbd11b46e3e3eb56156a98",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callcodeOutput2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xbcd873613b3f4a1da1c4bc521b8b265709bbac586a2c25e65d144463badc8064",
-                    "mixHash" : "0xcbe4a35c96e29d00212a2f4936efe8f356342c89855cf437d0437e748fc160e4",
-                    "nonce" : "0xb396275c1705c256",
+                    "hash" : "0x553e70daab7c833859c81f3a6a754da40ae4ba4102d438adf5abed35b99b32f2",
+                    "mixHash" : "0x9164a27466e7ddf15021a967aaa6cecfac5488c4f9b06f74ef75f97d606d3875",
+                    "nonce" : "0x31b4f4f67af905cf",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cbe4a35c96e29d00212a2f4936efe8f356342c89855cf437d0437e748fc160e488b396275c1705c256c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09164a27466e7ddf15021a967aaa6cecfac5488c4f9b06f74ef75f97d606d38758831b4f4f67af905cfc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcd873613b3f4a1da1c4bc521b8b265709bbac586a2c25e65d144463badc8064",
+        "lastblockhash" : "0x553e70daab7c833859c81f3a6a754da40ae4ba4102d438adf5abed35b99b32f2",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
index 1c87d5b41..094ffa7fd 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
@@ -2,8 +2,10 @@
     "callcodeOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x0623c1574519a8be2eae36828f374e0ea15968aba2e08ca3bd490b3683638bef",
-                    "mixHash" : "0xb4372a704b82f061b1a2802b504752aa5dba12c5d4f71b40366fb2efa6538e4f",
-                    "nonce" : "0x383fa41ebe6de161",
+                    "hash" : "0x4a28045dc5ed181a9d29aa82a75e0d2e3496d92d26ef34acb096bf555531567f",
+                    "mixHash" : "0x892f46cf39041a49f8200d0d8524b51ebc9cae5ec347fc03a9c2e68641fc48fd",
+                    "nonce" : "0x3e05ccf04bbf6b6e",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0400c0e06577e302b47f8f843c775be4e4323c6157993597e7a1baa07e51d380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b4372a704b82f061b1a2802b504752aa5dba12c5d4f71b40366fb2efa6538e4f88383fa41ebe6de161c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0400c0e06577e302b47f8f843c775be4e4323c6157993597e7a1baa07e51d380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0892f46cf39041a49f8200d0d8524b51ebc9cae5ec347fc03a9c2e68641fc48fd883e05ccf04bbf6b6ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0623c1574519a8be2eae36828f374e0ea15968aba2e08ca3bd490b3683638bef",
+        "lastblockhash" : "0x4a28045dc5ed181a9d29aa82a75e0d2e3496d92d26ef34acb096bf555531567f",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callcodeOutput3Fail_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xa87a4d2483bee653cf9b159b2388f2030a2d568555eaa6d3d24506c11a9916f5",
-                    "mixHash" : "0x2fb5aed32cc0efd7215bded85b4e4b093f2765ac906064fdda9b5e1aa3df4691",
-                    "nonce" : "0xf4b7f11248429db1",
-                    "number" : "0x01",
-                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xad2fa00b42c68336afe1f86dab2385be1cd82d78ef86b4c3f5e1bb60f9776a5e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad2fa00b42c68336afe1f86dab2385be1cd82d78ef86b4c3f5e1bb60f9776a5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02fb5aed32cc0efd7215bded85b4e4b093f2765ac906064fdda9b5e1aa3df469188f4b7f11248429db1c0c0",
-                "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" : "0xa87a4d2483bee653cf9b159b2388f2030a2d568555eaa6d3d24506c11a9916f5",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc3b71c24b0035448db11bac9967a722660f4ac10484240af6085c1947fe15699",
-                    "mixHash" : "0xa82aeab9407b792c58a20036971594416c4499ef2649286985d698bf9ee36957",
-                    "nonce" : "0xdd3b0845e28a2d77",
+                    "hash" : "0x8ab3a06728a93a78ed74ac6b2d20e3740dd13860cf3ba76648ccdb8019ba759e",
+                    "mixHash" : "0xbb060df1830f09e03578edea6d037af8b03b8485119f3b9fe087cda567340c98",
+                    "nonce" : "0xb306783593aeb5e5",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a82aeab9407b792c58a20036971594416c4499ef2649286985d698bf9ee3695788dd3b0845e28a2d77c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bb060df1830f09e03578edea6d037af8b03b8485119f3b9fe087cda567340c9888b306783593aeb5e5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc3b71c24b0035448db11bac9967a722660f4ac10484240af6085c1947fe15699",
+        "lastblockhash" : "0x8ab3a06728a93a78ed74ac6b2d20e3740dd13860cf3ba76648ccdb8019ba759e",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callcodeOutput3Fail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xbad60f633bf9e815488a78761cee9bb9e6a416dd08665c3d277446fbe2424b0b",
-                    "mixHash" : "0x2b45b6fae02eaf321efc9926ceecae353df83be39a429b8f939d69362e14b415",
-                    "nonce" : "0x680c9d13b726ad45",
+                    "hash" : "0xe4c2c1ad259237b02895a0c3b7beb10f75c155bca33cfad2c6d93a4bb10722f3",
+                    "mixHash" : "0xca39937cf95b6270e5deae3e3e5fb497685b42bc46dc8d6981a6fb4edb9114f5",
+                    "nonce" : "0x13877bd23e18a32a",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02b45b6fae02eaf321efc9926ceecae353df83be39a429b8f939d69362e14b41588680c9d13b726ad45c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ca39937cf95b6270e5deae3e3e5fb497685b42bc46dc8d6981a6fb4edb9114f58813877bd23e18a32ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbad60f633bf9e815488a78761cee9bb9e6a416dd08665c3d277446fbe2424b0b",
+        "lastblockhash" : "0xe4c2c1ad259237b02895a0c3b7beb10f75c155bca33cfad2c6d93a4bb10722f3",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callcodeOutput3Fail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x453a4067defd79bc4483b2f4f3f6a1ac6b67c2fc2a3ca9790e91a590f8c3f5c5",
-                    "mixHash" : "0xf9447f4448097fdf024491f7023fcabb0ffbf05294a64b4236f7728b3d62a95f",
-                    "nonce" : "0x001d4e0048dd903a",
+                    "hash" : "0xdf1a89c184b6ec9544cb4822c5f34490694070026566802c1598ed89fcab07c4",
+                    "mixHash" : "0x1fd3782e2363795ecb7dca4030c11ccf272da120d8d0aa6138c635ee42ff926b",
+                    "nonce" : "0x5c6bf89cc295f618",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f9447f4448097fdf024491f7023fcabb0ffbf05294a64b4236f7728b3d62a95f88001d4e0048dd903ac0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01fd3782e2363795ecb7dca4030c11ccf272da120d8d0aa6138c635ee42ff926b885c6bf89cc295f618c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x453a4067defd79bc4483b2f4f3f6a1ac6b67c2fc2a3ca9790e91a590f8c3f5c5",
+        "lastblockhash" : "0xdf1a89c184b6ec9544cb4822c5f34490694070026566802c1598ed89fcab07c4",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callcodeOutput3Fail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x95794a4e7025351a990d41f5a3a157a2a20e9dc4d7ac8db0ff7f9bd8680ca627",
-                    "mixHash" : "0x6737ebbb5c214f008ce6d161ba9305881c60567ee392f974585eb45cf8cc94bd",
-                    "nonce" : "0x4a1b2158306d9824",
+                    "hash" : "0x67c032cc9f661fc201dfc6099a13d6118467d0763e5ccdfded60e59168882539",
+                    "mixHash" : "0x49806a344c699a0140a5ecde37e6cb893f7559670d07d3d4f6456cfd1d5f7121",
+                    "nonce" : "0x07833a40cbca998b",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06737ebbb5c214f008ce6d161ba9305881c60567ee392f974585eb45cf8cc94bd884a1b2158306d9824c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a049806a344c699a0140a5ecde37e6cb893f7559670d07d3d4f6456cfd1d5f71218807833a40cbca998bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95794a4e7025351a990d41f5a3a157a2a20e9dc4d7ac8db0ff7f9bd8680ca627",
+        "lastblockhash" : "0x67c032cc9f661fc201dfc6099a13d6118467d0763e5ccdfded60e59168882539",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
index a05b1041c..942f0f4e5 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
@@ -2,8 +2,10 @@
     "callcodeOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xab60d76505ba0cd54c5b0660e3fea3066ec91dca9b089c83f34fa0be8f807fb7",
-                    "mixHash" : "0x65279fbf42738f718c935a9ff3ab0c145a81bb08ae8cf630885336265d957a39",
-                    "nonce" : "0x942734555597f644",
+                    "hash" : "0x0735b4454c7f3f8c2dc0076da22d2e68c7356cc5deeca75013f340e5140a1aab",
+                    "mixHash" : "0x9277ea03176430b458e778b32e9079e0aa879d2746953b94e431fab8788665d7",
+                    "nonce" : "0xa99ec28bdec902e2",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a065279fbf42738f718c935a9ff3ab0c145a81bb08ae8cf630885336265d957a3988942734555597f644c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09277ea03176430b458e778b32e9079e0aa879d2746953b94e431fab8788665d788a99ec28bdec902e2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab60d76505ba0cd54c5b0660e3fea3066ec91dca9b089c83f34fa0be8f807fb7",
+        "lastblockhash" : "0x0735b4454c7f3f8c2dc0076da22d2e68c7356cc5deeca75013f340e5140a1aab",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x9fd83aa78ef49ee6efd27bb13f23b5edc09d760bc905da5ca1f5741857e2b474",
-                    "mixHash" : "0x176092c4f14ab8e37a4513b507ca8282d1d1f2f9599274fd3384d9c02e8b2fb4",
-                    "nonce" : "0xcc3a2a7890a5c898",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xb6003d2c01ee74e7893ad02d7cb8a21679c517204dfa75229466c644334c04a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6003d2c01ee74e7893ad02d7cb8a21679c517204dfa75229466c644334c04a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0176092c4f14ab8e37a4513b507ca8282d1d1f2f9599274fd3384d9c02e8b2fb488cc3a2a7890a5c898c0c0",
-                "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" : "0x9fd83aa78ef49ee6efd27bb13f23b5edc09d760bc905da5ca1f5741857e2b474",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4df9479b3ad38cc9450bd2a33390a7fa8eaeb75e82e4cdb4a2c4b7a346f21e1a",
-                    "mixHash" : "0x48f4a5cae082eb71f2299d4e7e7a6446eed43b3e1f54271981ff370e786f1cb6",
-                    "nonce" : "0x6190159950c583ef",
+                    "hash" : "0xe8220793d7572bd54afb9c2bf6c0153e5906bc642b50d5cc75382eca57af747f",
+                    "mixHash" : "0xfdf19646087d9659bbf81572a002343dcc54d7e08fd2bfef7dcbfa1761edb52f",
+                    "nonce" : "0x12a110643e3d9f80",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a048f4a5cae082eb71f2299d4e7e7a6446eed43b3e1f54271981ff370e786f1cb6886190159950c583efc0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fdf19646087d9659bbf81572a002343dcc54d7e08fd2bfef7dcbfa1761edb52f8812a110643e3d9f80c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4df9479b3ad38cc9450bd2a33390a7fa8eaeb75e82e4cdb4a2c4b7a346f21e1a",
+        "lastblockhash" : "0xe8220793d7572bd54afb9c2bf6c0153e5906bc642b50d5cc75382eca57af747f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callcodeOutput3_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa5e4ec60942e1f030458e668c65e111859e44dfcbb30c8e4b6f10bbfc93d4490",
-                    "mixHash" : "0x5b122ffa6760307923eba8da19ee28ff542a61d000185d580326ac8a5b44e3c1",
-                    "nonce" : "0x2cca840ab72c55b6",
+                    "hash" : "0xd768dada2d24b8a8182ecd0be237dafe96a00ac64ba5c39459ef79960a005507",
+                    "mixHash" : "0x810df233d0c5ca17904dcd5333a80a7b91c927324eed28b0e9f0be89a53b555e",
+                    "nonce" : "0x84cea10ae49bdb0a",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05b122ffa6760307923eba8da19ee28ff542a61d000185d580326ac8a5b44e3c1882cca840ab72c55b6c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0810df233d0c5ca17904dcd5333a80a7b91c927324eed28b0e9f0be89a53b555e8884cea10ae49bdb0ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5e4ec60942e1f030458e668c65e111859e44dfcbb30c8e4b6f10bbfc93d4490",
+        "lastblockhash" : "0xd768dada2d24b8a8182ecd0be237dafe96a00ac64ba5c39459ef79960a005507",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callcodeOutput3_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x518d9f8b5e28c2e57cbf714d2a8410c147dc87d3ae0c63bfc36a9fc06e4a5c51",
-                    "mixHash" : "0x3bc4fd8f3d9037aa9e6ffe82fef1db22eb038981318b2ae764ecb43c2523a84f",
-                    "nonce" : "0xad503d6194ca9dc8",
+                    "hash" : "0xc6cbdd0d5a8c221ac3bfb127d2bd8d4b57661e85938257a851523efb5a6913fa",
+                    "mixHash" : "0x2c792d7f049a5f049809c79a9fc186435e7eee7a08c2ca49898448c2f658af06",
+                    "nonce" : "0xd267bcb12a39356a",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03bc4fd8f3d9037aa9e6ffe82fef1db22eb038981318b2ae764ecb43c2523a84f88ad503d6194ca9dc8c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02c792d7f049a5f049809c79a9fc186435e7eee7a08c2ca49898448c2f658af0688d267bcb12a39356ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x518d9f8b5e28c2e57cbf714d2a8410c147dc87d3ae0c63bfc36a9fc06e4a5c51",
+        "lastblockhash" : "0xc6cbdd0d5a8c221ac3bfb127d2bd8d4b57661e85938257a851523efb5a6913fa",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callcodeOutput3_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc05fb63b0d58a5a8966e2196a6f31666bcabab2fd850cc9f77bb2acd1db4c23a",
-                    "mixHash" : "0xf19018c2995d072d61a1d92f3c4777ce9de16059582d08056f8d002d809b5c1a",
-                    "nonce" : "0x99db6841a33c0faf",
+                    "hash" : "0x8d3a2229ef1b491bcc567d578b576c317d0f66614c84bcebb5a6cdcb3df70fd2",
+                    "mixHash" : "0xecbd6afbf24e1d5261a71236d38bfbf9fa4a9339180d69c2d2484f1ce75d4877",
+                    "nonce" : "0x9b1d1bb995a076e2",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f19018c2995d072d61a1d92f3c4777ce9de16059582d08056f8d002d809b5c1a8899db6841a33c0fafc0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ecbd6afbf24e1d5261a71236d38bfbf9fa4a9339180d69c2d2484f1ce75d4877889b1d1bb995a076e2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc05fb63b0d58a5a8966e2196a6f31666bcabab2fd850cc9f77bb2acd1db4c23a",
+        "lastblockhash" : "0x8d3a2229ef1b491bcc567d578b576c317d0f66614c84bcebb5a6cdcb3df70fd2",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
index 58e90570c..17d99df48 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
@@ -2,8 +2,10 @@
     "callcodeOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x937ff20588d69c211f59802f3640859dc622ca3017fdd007d550c02d66d725ac",
-                    "mixHash" : "0x56c7f9cd704f2fdbb0114873a2f11bb4542b8d09ebb96ecb5a12cc705e0b8c04",
-                    "nonce" : "0x199d4d3c08e16f44",
+                    "hash" : "0x8cb3896d5768cd9892b725fb1b4ff028ccd0e518927bc15274789fec33732330",
+                    "mixHash" : "0x2ffbea340b5a90e2d9a6446e052ec11cee4cdba6534dbea2b566e5efce636961",
+                    "nonce" : "0xbcd7b1dc154be0fe",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a056c7f9cd704f2fdbb0114873a2f11bb4542b8d09ebb96ecb5a12cc705e0b8c0488199d4d3c08e16f44c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02ffbea340b5a90e2d9a6446e052ec11cee4cdba6534dbea2b566e5efce63696188bcd7b1dc154be0fec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x937ff20588d69c211f59802f3640859dc622ca3017fdd007d550c02d66d725ac",
+        "lastblockhash" : "0x8cb3896d5768cd9892b725fb1b4ff028ccd0e518927bc15274789fec33732330",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callcodeOutput3partialFail_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xba41bbaf6fb11c9057fd539351e4ec47ace8efa70904f729e127c433b10a28a6",
-                    "mixHash" : "0xa62235a1fa2bfaf46f07a9f4d353a6a6535d3e35875dbb4169fdb07d980809b0",
-                    "nonce" : "0x5442ccb5f261c5f6",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xe893c90f6397a5a5184908f5cca0c5d6825ec606b7d6ef30ab7fa509b178a466",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e893c90f6397a5a5184908f5cca0c5d6825ec606b7d6ef30ab7fa509b178a466a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a62235a1fa2bfaf46f07a9f4d353a6a6535d3e35875dbb4169fdb07d980809b0885442ccb5f261c5f6c0c0",
-                "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" : "0xba41bbaf6fb11c9057fd539351e4ec47ace8efa70904f729e127c433b10a28a6",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xe67449f653497377ecd436f40ac7d9b4f9719b3f486179894da85dcf1f3e93a9",
-                    "mixHash" : "0x0f88ce67de5983f59c9f2a830ad77cd072aef0bf356bdf890950162c941ecc2b",
-                    "nonce" : "0xe5e34ea65945cad9",
+                    "hash" : "0x9d3e2eba4a21d4fae4014eb8474271ea47b97256e617232ec4b44f9e1e853df3",
+                    "mixHash" : "0xb4556b79758d07afcc01ee9ba89a8922ef94e768b25c6ca9254982f097cfef8b",
+                    "nonce" : "0x9149a98ccf41e9e0",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00f88ce67de5983f59c9f2a830ad77cd072aef0bf356bdf890950162c941ecc2b88e5e34ea65945cad9c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b4556b79758d07afcc01ee9ba89a8922ef94e768b25c6ca9254982f097cfef8b889149a98ccf41e9e0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe67449f653497377ecd436f40ac7d9b4f9719b3f486179894da85dcf1f3e93a9",
+        "lastblockhash" : "0x9d3e2eba4a21d4fae4014eb8474271ea47b97256e617232ec4b44f9e1e853df3",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callcodeOutput3partialFail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x348ba7d14b96cc35ddb02447995b14e7bcea3f39c3cc5ae470aaa329404603b1",
-                    "mixHash" : "0x2a607db6124942237b9e3618bc687acbdf18d77ee70e74fc6eb33d85d3c61520",
-                    "nonce" : "0x1da316035fa071d4",
+                    "hash" : "0x022dd503cbf13b308e02f07a65db97ab0e638a25fb0b4eb34fc507a4469393f1",
+                    "mixHash" : "0x56e3a26bbaeb168fac6bf0b2d02a5cafc130d51e5609c00e267907d3fc8c5e2e",
+                    "nonce" : "0xa0267ba5c931d022",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02a607db6124942237b9e3618bc687acbdf18d77ee70e74fc6eb33d85d3c61520881da316035fa071d4c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a056e3a26bbaeb168fac6bf0b2d02a5cafc130d51e5609c00e267907d3fc8c5e2e88a0267ba5c931d022c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x348ba7d14b96cc35ddb02447995b14e7bcea3f39c3cc5ae470aaa329404603b1",
+        "lastblockhash" : "0x022dd503cbf13b308e02f07a65db97ab0e638a25fb0b4eb34fc507a4469393f1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callcodeOutput3partialFail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x6c8544d74aae08967bdeb153850d5a20298c20f7f29ae31c73da24c140c19713",
-                    "mixHash" : "0x6b116499beadce311eaece71b722676f6c0f37e16cf481156abd619ccbb3c52b",
-                    "nonce" : "0xd8938bdc7891fb71",
+                    "hash" : "0xb7cfb41cff3ca6d1ae32d3877c79a03b3a15fd9fd96ab4cfc1c33134abb67777",
+                    "mixHash" : "0x141e5f06b8f7de26ace85a02aa1a16804cd0c6de63fad7948af553c4adea9144",
+                    "nonce" : "0x33aafa5bff3b9ff3",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06b116499beadce311eaece71b722676f6c0f37e16cf481156abd619ccbb3c52b88d8938bdc7891fb71c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0141e5f06b8f7de26ace85a02aa1a16804cd0c6de63fad7948af553c4adea91448833aafa5bff3b9ff3c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c8544d74aae08967bdeb153850d5a20298c20f7f29ae31c73da24c140c19713",
+        "lastblockhash" : "0xb7cfb41cff3ca6d1ae32d3877c79a03b3a15fd9fd96ab4cfc1c33134abb67777",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callcodeOutput3partialFail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xcbb7719dea331f80e59803b33db90319f1b0d85a1db40acfb24272d133654157",
-                    "mixHash" : "0x3ca883c82ffa1e4318b40e7482b35333fac89ae2f8772747683713d9ec4a04bc",
-                    "nonce" : "0x704164c49b1eaa15",
+                    "hash" : "0xa32267d62f59bbc6cab41ff3886adb458b133bb70efae19abdcecc773830b38f",
+                    "mixHash" : "0x73876a7455543c9cbaba006e36dd95ffb35b9fdb49f8b86020d713e9ece7d66d",
+                    "nonce" : "0x07fcb247f5e4fb8b",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03ca883c82ffa1e4318b40e7482b35333fac89ae2f8772747683713d9ec4a04bc88704164c49b1eaa15c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a073876a7455543c9cbaba006e36dd95ffb35b9fdb49f8b86020d713e9ece7d66d8807fcb247f5e4fb8bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcbb7719dea331f80e59803b33db90319f1b0d85a1db40acfb24272d133654157",
+        "lastblockhash" : "0xa32267d62f59bbc6cab41ff3886adb458b133bb70efae19abdcecc773830b38f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
index 2dc5031c1..7c7b35e36 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
@@ -2,8 +2,10 @@
     "callcodeOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x804312321613f38a3dfe245118364bce39697d8ed8e51aaf066703df554d8f22",
-                    "mixHash" : "0xcf8b71957592823de355c0867480c517cb75120c3171dc69fcaafb12426f1aca",
-                    "nonce" : "0xff9238740733bb92",
+                    "hash" : "0x9bd6ac1cddcfdfa1fe762f5765fda0e14a3039fa64b63245b1317e61a3149961",
+                    "mixHash" : "0x9b3089974d187974a8cc5be01737fd65e1e4fe779ac50d593d6bf4d610948667",
+                    "nonce" : "0x62eb11a25ed65c3b",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cf8b71957592823de355c0867480c517cb75120c3171dc69fcaafb12426f1aca88ff9238740733bb92c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09b3089974d187974a8cc5be01737fd65e1e4fe779ac50d593d6bf4d6109486678862eb11a25ed65c3bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x804312321613f38a3dfe245118364bce39697d8ed8e51aaf066703df554d8f22",
+        "lastblockhash" : "0x9bd6ac1cddcfdfa1fe762f5765fda0e14a3039fa64b63245b1317e61a3149961",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -107,126 +109,13 @@
             }
         }
     },
-    "callcodeOutput3partial_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xcf6d84c92f9190a090d63a8d9ac05ac454da39dc87095fdb7f5e1bcfa4d5aad0",
-                    "mixHash" : "0x994098bb9bc8a9c269a5f33c92ec4d4f18108144da4ba81017ca1156fd4fc729",
-                    "nonce" : "0x79c029373498a3bd",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xaf67dd2c08eb95b3196292d9137020e57a22ad3e9301191205709b34c0c19fae",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af67dd2c08eb95b3196292d9137020e57a22ad3e9301191205709b34c0c19faea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0994098bb9bc8a9c269a5f33c92ec4d4f18108144da4ba81017ca1156fd4fc7298879c029373498a3bdc0c0",
-                "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" : "0xcf6d84c92f9190a090d63a8d9ac05ac454da39dc87095fdb7f5e1bcfa4d5aad0",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c0000",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -237,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc83452d910b51040aa7f19a4eb3e8d6a6b70589e8115fbbe4df55320cc8e818e",
-                    "mixHash" : "0xd16d220c1245486328cc9ff86daa9930c9572fff062609db7eac8059d914349f",
-                    "nonce" : "0x49e5ddd214f82961",
+                    "hash" : "0x0b83d9237147466e92e8bf9d547ddafd770e38b69e7b699e6362496ac3c745e1",
+                    "mixHash" : "0x5b5e8a83bebf4a448d60932fc439c1243431681ac6582d3afd0a00fb7230df96",
+                    "nonce" : "0x0182d96a533bf820",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -248,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d16d220c1245486328cc9ff86daa9930c9572fff062609db7eac8059d914349f8849e5ddd214f82961c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05b5e8a83bebf4a448d60932fc439c1243431681ac6582d3afd0a00fb7230df96880182d96a533bf820c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -274,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc83452d910b51040aa7f19a4eb3e8d6a6b70589e8115fbbe4df55320cc8e818e",
+        "lastblockhash" : "0x0b83d9237147466e92e8bf9d547ddafd770e38b69e7b699e6362496ac3c745e1",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -333,8 +222,10 @@
     "callcodeOutput3partial_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -345,9 +236,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc6e79d232e2b43117cfd640c6482f3d2cc4697201be0bde710bbe2a658b0978b",
-                    "mixHash" : "0x0186357642e47da9d644a20fd7d8bccc2bd483ea9c64e3b030c92a149ac49b72",
-                    "nonce" : "0xe7dca53645496901",
+                    "hash" : "0x5db2925f45e60eff7b8b4cecd3d72611da63e622a0db350118ea783980baac29",
+                    "mixHash" : "0xecfba6c9c6141bfe01f5c05c79c09b53572f4e9d8e10c3b063a5d57a03de6e5b",
+                    "nonce" : "0x9b71dccafbcb0b04",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -356,7 +247,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00186357642e47da9d644a20fd7d8bccc2bd483ea9c64e3b030c92a149ac49b7288e7dca53645496901c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ecfba6c9c6141bfe01f5c05c79c09b53572f4e9d8e10c3b063a5d57a03de6e5b889b71dccafbcb0b04c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -382,7 +273,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6e79d232e2b43117cfd640c6482f3d2cc4697201be0bde710bbe2a658b0978b",
+        "lastblockhash" : "0x5db2925f45e60eff7b8b4cecd3d72611da63e622a0db350118ea783980baac29",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -441,8 +332,10 @@
     "callcodeOutput3partial_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9dce97086826f88854119357e7774cbbac2c641a5f466342fb0b9d1329475d94",
-                    "mixHash" : "0xea1c57901107658da4f2c361d91d44b5ee1d00992e0761e8659b3df0961f1999",
-                    "nonce" : "0x3bd1a547a0fa23d2",
+                    "hash" : "0x3db663d1604572a7e495de0ef9e93c32053af0ce0da0a60582d14896741e47c8",
+                    "mixHash" : "0x2b8ba5d698be2594031a0ad1d92546aae9245c706123439f9e1b5a617da7d10a",
+                    "nonce" : "0x15d506020543b764",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -464,7 +357,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ea1c57901107658da4f2c361d91d44b5ee1d00992e0761e8659b3df0961f1999883bd1a547a0fa23d2c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02b8ba5d698be2594031a0ad1d92546aae9245c706123439f9e1b5a617da7d10a8815d506020543b764c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -490,7 +383,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dce97086826f88854119357e7774cbbac2c641a5f466342fb0b9d1329475d94",
+        "lastblockhash" : "0x3db663d1604572a7e495de0ef9e93c32053af0ce0da0a60582d14896741e47c8",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -549,8 +442,10 @@
     "callcodeOutput3partial_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -561,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd5f1f9f1f33d83aec697a09796f8dca1304e5983c8d3606e092eff94554dfa43",
-                    "mixHash" : "0xda8b1dbd2e3eca3110ae1a7d7cb963ccfefcbc57963e96780e23dea0383a7700",
-                    "nonce" : "0x76849f622db25738",
+                    "hash" : "0x3e8a9096532fc4bca4752bd609ca7f93a49e123a02553137ccdc8316aad70f81",
+                    "mixHash" : "0x88cb7edf2faa22ca5dc19dfb27ab71c60dcc0915753449ef3d1cbd4ca60ae2f7",
+                    "nonce" : "0xf9cd6dccb95b3241",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -572,7 +467,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0da8b1dbd2e3eca3110ae1a7d7cb963ccfefcbc57963e96780e23dea0383a77008876849f622db25738c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a088cb7edf2faa22ca5dc19dfb27ab71c60dcc0915753449ef3d1cbd4ca60ae2f788f9cd6dccb95b3241c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -598,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5f1f9f1f33d83aec697a09796f8dca1304e5983c8d3606e092eff94554dfa43",
+        "lastblockhash" : "0x3e8a9096532fc4bca4752bd609ca7f93a49e123a02553137ccdc8316aad70f81",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
index c5cf57e9e..746973a53 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
@@ -2,8 +2,10 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x7bc3fb4f9b7f003f9ae10bea0021e99450d85da4d06f3dac4b0b3edb1915793b",
-                    "mixHash" : "0xc9dfff344668ebbb31a0fb2558d8efcfa9a55efd9c6765304ebad46540fdd1fe",
-                    "nonce" : "0x7ba1cae924989986",
+                    "hash" : "0x62e65ad01ead09019bf88d898287a23944775444c74945e842965330ec49deaf",
+                    "mixHash" : "0x5ba68e6faef8b4327bc14973f90fdfd7ff8de7b2eeb4d506a6b9d2345f013212",
+                    "nonce" : "0x661373598621c264",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0c9dfff344668ebbb31a0fb2558d8efcfa9a55efd9c6765304ebad46540fdd1fe887ba1cae924989986f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a05ba68e6faef8b4327bc14973f90fdfd7ff8de7b2eeb4d506a6b9d2345f01321288661373598621c264f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bc3fb4f9b7f003f9ae10bea0021e99450d85da4d06f3dac4b0b3edb1915793b",
+        "lastblockhash" : "0x62e65ad01ead09019bf88d898287a23944775444c74945e842965330ec49deaf",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "callcodeWithHighValueAndGasOOG_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0x1af374461ff48b1931e000c56c3c0b93144212e3eff8b58d78e44480ef637496",
-                    "mixHash" : "0x0b014a6d52a397018f49920b8916e5fb163afee796cf0de37d3c3a49654c0df5",
-                    "nonce" : "0x67d3cea444d501f0",
-                    "number" : "0x01",
-                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x500558d0462adb9431982bc7e431d2c767ac3e9f53a1135dce43b8f5c65aa7e2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0500558d0462adb9431982bc7e431d2c767ac3e9f53a1135dce43b8f5c65aa7e2a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a00b014a6d52a397018f49920b8916e5fb163afee796cf0de37d3c3a49654c0df58867d3cea444d501f0f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "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" : "0x1af374461ff48b1931e000c56c3c0b93144212e3eff8b58d78e44480ef637496",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cf149",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x563c4978c8c0a7f4bc3d6e1a371ac33e47d55c490b75b13510c6110134f9d4de",
-                    "mixHash" : "0xf771d24c568a63e5fcfcc0227b08d2d050380250a277826d95c0837ac41718c5",
-                    "nonce" : "0x7e9eb40621b9b9db",
+                    "hash" : "0xe09257371ad7bb80b4de6309338f9dae3810eb579877b554ddc9bd3737d38f3f",
+                    "mixHash" : "0x99a115f4a258e54944390b57b45aeb3d72892f7a5da999b2448170c8e39f76b1",
+                    "nonce" : "0x2ccadf3bd237176f",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0f771d24c568a63e5fcfcc0227b08d2d050380250a277826d95c0837ac41718c5887e9eb40621b9b9dbf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a099a115f4a258e54944390b57b45aeb3d72892f7a5da999b2448170c8e39f76b1882ccadf3bd237176ff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x563c4978c8c0a7f4bc3d6e1a371ac33e47d55c490b75b13510c6110134f9d4de",
+        "lastblockhash" : "0xe09257371ad7bb80b4de6309338f9dae3810eb579877b554ddc9bd3737d38f3f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -372,8 +248,10 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x765cb7714233ec4ae5bd6bcda4fd79ee60cb72eb1019ec9aa575f1a431049838",
-                    "mixHash" : "0x2768190833c72410a5b4eaec8bfa05461f03b88f9b5278ad3ce157099f174c90",
-                    "nonce" : "0xe0392e13b53149b8",
+                    "hash" : "0x6d50edb5c9accaaff65aba1c1c8041657338deb2604f2f5cb4ee45aaeffdbcff",
+                    "mixHash" : "0x7eebe784147f49603bfb38c32bfb2a042e17cca20604ff894a448b2077d9d317",
+                    "nonce" : "0x4eade0c6e6b60175",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a02768190833c72410a5b4eaec8bfa05461f03b88f9b5278ad3ce157099f174c9088e0392e13b53149b8f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a07eebe784147f49603bfb38c32bfb2a042e17cca20604ff894a448b2077d9d317884eade0c6e6b60175f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x765cb7714233ec4ae5bd6bcda4fd79ee60cb72eb1019ec9aa575f1a431049838",
+        "lastblockhash" : "0x6d50edb5c9accaaff65aba1c1c8041657338deb2604f2f5cb4ee45aaeffdbcff",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -493,8 +371,10 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x40817cd67f53d72b74db6961a3e2e7b57a1da9cec863ace6dee2b104512a2a18",
-                    "mixHash" : "0xecad46d71791de0e77fd3858cef4ef8c5bc6b4ef2c377ac120e2ce291ecee877",
-                    "nonce" : "0xa102814a9eefbe1e",
+                    "hash" : "0xc121456d49115d2a6fe85826241c16f0ea7f85736cd3b2635e938806c47d22c4",
+                    "mixHash" : "0x673eb2dcc97377174af7d65abaea0563ffe695b19b3c475871d0ad5617106826",
+                    "nonce" : "0x57de80d5d4b576c8",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ecad46d71791de0e77fd3858cef4ef8c5bc6b4ef2c377ac120e2ce291ecee87788a102814a9eefbe1ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0673eb2dcc97377174af7d65abaea0563ffe695b19b3c475871d0ad56171068268857de80d5d4b576c8f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40817cd67f53d72b74db6961a3e2e7b57a1da9cec863ace6dee2b104512a2a18",
+        "lastblockhash" : "0xc121456d49115d2a6fe85826241c16f0ea7f85736cd3b2635e938806c47d22c4",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -612,8 +492,10 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x872953962a8a10b27182739dceb0ae5a5b384cc592dc1eb8460f2ff7f46854bc",
-                    "mixHash" : "0x47f88730d68d2b2cbbb1eb3126ffd4d147c29743adbaeedbbede23e773be276d",
-                    "nonce" : "0xb6e7d5b47d58123e",
+                    "hash" : "0x0e18d2a887e3dc11f89c903e881843060192695713e45da44eefbc07b40d1360",
+                    "mixHash" : "0xc9fcfd4d52a17ab001c7fc8fac8d477862ee82e947c61773857c0dc639cd1a40",
+                    "nonce" : "0x0c54dad82246976c",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a047f88730d68d2b2cbbb1eb3126ffd4d147c29743adbaeedbbede23e773be276d88b6e7d5b47d58123ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c9fcfd4d52a17ab001c7fc8fac8d477862ee82e947c61773857c0dc639cd1a40880c54dad82246976cf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x872953962a8a10b27182739dceb0ae5a5b384cc592dc1eb8460f2ff7f46854bc",
+        "lastblockhash" : "0x0e18d2a887e3dc11f89c903e881843060192695713e45da44eefbc07b40d1360",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
index 64f1f6a62..6b4bae707 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
@@ -2,8 +2,10 @@
     "deleagateCallAfterValueTransfer_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0x20e6a5afd77c18c2826715b0dd588f153061db71c1138594c705572942fe3770",
-                    "mixHash" : "0x35588ce71d3ca8a467543f83180e4353787b1a6d2e9375afe3bef53c8849329b",
-                    "nonce" : "0x946e34e2578eba09",
+                    "hash" : "0x6211ada62171d1ced7620ca87fc67085e52c44ea9f0edfb1d6c9f9cc502e3d0e",
+                    "mixHash" : "0x6a51f8e72b5c245c348f755509f857066225353ca380228b09a9157ecc58664b",
+                    "nonce" : "0x9baf2c7144603ccc",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b299540b7c4dadaa2ca384533aa20b49acb91f2c4360feb6bd50880c0fc6bd1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a035588ce71d3ca8a467543f83180e4353787b1a6d2e9375afe3bef53c8849329b88946e34e2578eba09f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b299540b7c4dadaa2ca384533aa20b49acb91f2c4360feb6bd50880c0fc6bd1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a06a51f8e72b5c245c348f755509f857066225353ca380228b09a9157ecc58664b889baf2c7144603cccf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x20e6a5afd77c18c2826715b0dd588f153061db71c1138594c705572942fe3770",
+        "lastblockhash" : "0x6211ada62171d1ced7620ca87fc67085e52c44ea9f0edfb1d6c9f9cc502e3d0e",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "deleagateCallAfterValueTransfer_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0104c0",
-                    "hash" : "0xe649a477e499c631227d19f9ee07b82d60fb690de602b609b0b9c76209f8742c",
-                    "mixHash" : "0xc0df63873b163b8121e32f8274b2956bdca928a0073ab291238e4fd5abb8e462",
-                    "nonce" : "0x6c6349ff9acad72b",
-                    "number" : "0x01",
-                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
-                    "stateRoot" : "0x2e60d9a06d6f6f86590c22ba77486437f192083ec8e71f00b55c682f0be63330",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e60d9a06d6f6f86590c22ba77486437f192083ec8e71f00b55c682f0be63330a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0c0df63873b163b8121e32f8274b2956bdca928a0073ab291238e4fd5abb8e462886c6349ff9acad72bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "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" : "0xe649a477e499c631227d19f9ee07b82d60fb690de602b609b0b9c76209f8742c",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x02" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x3460005533600155600035600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62d04c0",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0x57016a29fb68d1a1522825ae775cfe877f5e85343928210963da63060f3d20ce",
-                    "mixHash" : "0x0705c4f1d2c975691341baebdbbe34a9459deb394b333ccd464866f838dc3f99",
-                    "nonce" : "0xb7721baa360894a9",
+                    "hash" : "0x73cd3240000b7b3c65cdfeb0eaba50bb15619abb8943eb03aaaa7d7eaa2312cd",
+                    "mixHash" : "0x54fa4eb51abd28f5963d7770fa8389183797454baf5f2fec62d804f875f74dff",
+                    "nonce" : "0x34926cb6d48cf97c",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a00705c4f1d2c975691341baebdbbe34a9459deb394b333ccd464866f838dc3f9988b7721baa360894a9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a054fa4eb51abd28f5963d7770fa8389183797454baf5f2fec62d804f875f74dff8834926cb6d48cf97cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57016a29fb68d1a1522825ae775cfe877f5e85343928210963da63060f3d20ce",
+        "lastblockhash" : "0x73cd3240000b7b3c65cdfeb0eaba50bb15619abb8943eb03aaaa7d7eaa2312cd",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -372,8 +248,10 @@
     "deleagateCallAfterValueTransfer_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0x0f4ef029b96ac72e0a09879a771a0322bdd901ab2453d84f0d44e190f5ee55b7",
-                    "mixHash" : "0x3731f0daca48cd8746dfdd9200a0151a9d686b02b245fc08adddbfe7f3c43dc6",
-                    "nonce" : "0x7c2b715f48656753",
+                    "hash" : "0x4564435cc745659d1e4ebe5569755a10fa33dd1b56ac24dbfe82044da2703baf",
+                    "mixHash" : "0x6cf7fdf000c8dbd335f974ffd0607bd06afdb7042dfcf868df894842763bee14",
+                    "nonce" : "0x2c7ccf445644e532",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a03731f0daca48cd8746dfdd9200a0151a9d686b02b245fc08adddbfe7f3c43dc6887c2b715f48656753f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a06cf7fdf000c8dbd335f974ffd0607bd06afdb7042dfcf868df894842763bee14882c7ccf445644e532f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f4ef029b96ac72e0a09879a771a0322bdd901ab2453d84f0d44e190f5ee55b7",
+        "lastblockhash" : "0x4564435cc745659d1e4ebe5569755a10fa33dd1b56ac24dbfe82044da2703baf",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -493,8 +371,10 @@
     "deleagateCallAfterValueTransfer_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0xb0e03edc55d4569d15dcda63917a9184283095c8971c452d8c3cc76ef8b32df8",
-                    "mixHash" : "0x24d3903a1807f2e369706d972db32eb08258d37a16c08ddc6875ac9114ed78a1",
-                    "nonce" : "0x707aa92db95c6cac",
+                    "hash" : "0x16c16223456af1c80371b608a25b3045ceb58186ce5acceb665f780ef3934d76",
+                    "mixHash" : "0x8b77f264fe16cd0efc635b41b7af154a5c274a361aae26c2d9f61027e2b6e718",
+                    "nonce" : "0xff0f264f0daedb4c",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0xf9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a024d3903a1807f2e369706d972db32eb08258d37a16c08ddc6875ac9114ed78a188707aa92db95c6cacf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a08b77f264fe16cd0efc635b41b7af154a5c274a361aae26c2d9f61027e2b6e71888ff0f264f0daedb4cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0e03edc55d4569d15dcda63917a9184283095c8971c452d8c3cc76ef8b32df8",
+        "lastblockhash" : "0x16c16223456af1c80371b608a25b3045ceb58186ce5acceb665f780ef3934d76",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -612,8 +492,10 @@
     "deleagateCallAfterValueTransfer_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01022c",
-                    "hash" : "0x3d8e62b5136ee9648eb079b8a9b96df434022c76e9240e019cba01d4389b377d",
-                    "mixHash" : "0x0a47f32349590686ec952ed32d086069bcc78516acb6bf2860355bf16bd91356",
-                    "nonce" : "0x05add5229c5e7da8",
+                    "hash" : "0xb66b6bbb5fe18fed6a4f36adacbafe39a2733b41ace20e038923cc7ccd3f19b4",
+                    "mixHash" : "0xf0e24f6d2f93154858a2526c0cfd25e0bce449de7156af22d91ff9b06b85ab0a",
+                    "nonce" : "0x2749112fd4bdd263",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0xb39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a00a47f32349590686ec952ed32d086069bcc78516acb6bf2860355bf16bd913568805add5229c5e7da8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a0f0e24f6d2f93154858a2526c0cfd25e0bce449de7156af22d91ff9b06b85ab0a882749112fd4bdd263f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d8e62b5136ee9648eb079b8a9b96df434022c76e9240e019cba01d4389b377d",
+        "lastblockhash" : "0xb66b6bbb5fe18fed6a4f36adacbafe39a2733b41ace20e038923cc7ccd3f19b4",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
index 1240d4e78..f928c7cdd 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0xbb5a333145dc5c5189296e79af56d68476877786b36da7368415baec1a534bc7",
-                    "mixHash" : "0xec780831c769c7f24ff781b952e1d735b54246e30351ba8b4c2e2769a8332f3d",
-                    "nonce" : "0x467c93526801a0d1",
+                    "hash" : "0x01cba681bb1925769c3655a73ae61fd4e99c2a16d9b4b089872693f3127a899d",
+                    "mixHash" : "0x4851b36e8d16b7ef3d6ba39fcf1033d3f7a388682ecbf0bb8bde2683d6dd8a94",
+                    "nonce" : "0x476413db6b719934",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0596e3cc8927f08d3a467374415b5b407d89ab7d0cbd5c3329880de0667e0a169a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0ec780831c769c7f24ff781b952e1d735b54246e30351ba8b4c2e2769a8332f3d88467c93526801a0d1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0596e3cc8927f08d3a467374415b5b407d89ab7d0cbd5c3329880de0667e0a169a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a04851b36e8d16b7ef3d6ba39fcf1033d3f7a388682ecbf0bb8bde2683d6dd8a9488476413db6b719934f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb5a333145dc5c5189296e79af56d68476877786b36da7368415baec1a534bc7",
+        "lastblockhash" : "0x01cba681bb1925769c3655a73ae61fd4e99c2a16d9b4b089872693f3127a899d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "delegatecallAndOOGatTxLevel_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf131",
-                    "hash" : "0x5466b83d124edd33679b19788718e67518b25e5bd12ddc5e103f6e343c1120fa",
-                    "mixHash" : "0x1da1daf6b332787f2b6860c1ec2f6724a930ac947906536933394a5aa286d67d",
-                    "nonce" : "0x60683852ca495d61",
-                    "number" : "0x01",
-                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
-                    "stateRoot" : "0x9e92006fe17bad6a64f3a6c60cd0488fe54782a0209902cee1fad8dfd27eb488",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e92006fe17bad6a64f3a6c60cd0488fe54782a0209902cee1fad8dfd27eb488a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a01da1daf6b332787f2b6860c1ec2f6724a930ac947906536933394a5aa286d67d8860683852ca495d61f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "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" : "0x5466b83d124edd33679b19788718e67518b25e5bd12ddc5e103f6e343c1120fa",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cf131",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0xa16d657f3cc8de2c65cdb23358194a30eb62a27664352ec9085b6c1d480f2ae8",
-                    "mixHash" : "0x46073830be866d7aedfda01abccaeb8834a72dd3b3613861aad61ff73d6f1ae8",
-                    "nonce" : "0x004ef169e76888f5",
+                    "hash" : "0x82359276c055dc42e8816c51b0710fdf77dadbc6213af73e4c56b9252f79c503",
+                    "mixHash" : "0x3128eed4ff8d8fb20a28c766542607b68e9b28e8751b322c0dfef5db3aea3604",
+                    "nonce" : "0x6501030fa4a9b7fe",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a046073830be866d7aedfda01abccaeb8834a72dd3b3613861aad61ff73d6f1ae888004ef169e76888f5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a03128eed4ff8d8fb20a28c766542607b68e9b28e8751b322c0dfef5db3aea3604886501030fa4a9b7fef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa16d657f3cc8de2c65cdb23358194a30eb62a27664352ec9085b6c1d480f2ae8",
+        "lastblockhash" : "0x82359276c055dc42e8816c51b0710fdf77dadbc6213af73e4c56b9252f79c503",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -372,8 +248,10 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0x5f22028f7980ee716e165b51677998dcb4264be19170427612f8466d10285ccc",
-                    "mixHash" : "0x3a76b63d4aed068bbdadda8ad8628b21a010a2c1b8af10b96de9b5d477676261",
-                    "nonce" : "0x6f736e8acf644f23",
+                    "hash" : "0x34f643dc9e7790d16f73d1fb50db495d1bc969fd2287b57c44ef21672b8afd40",
+                    "mixHash" : "0x33504b0e791c4f5f6318806984f8303078b510403afab9d07361eeec93b82d56",
+                    "nonce" : "0xfaf17d456d34699d",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a03a76b63d4aed068bbdadda8ad8628b21a010a2c1b8af10b96de9b5d477676261886f736e8acf644f23f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a033504b0e791c4f5f6318806984f8303078b510403afab9d07361eeec93b82d5688faf17d456d34699df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f22028f7980ee716e165b51677998dcb4264be19170427612f8466d10285ccc",
+        "lastblockhash" : "0x34f643dc9e7790d16f73d1fb50db495d1bc969fd2287b57c44ef21672b8afd40",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -493,8 +371,10 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x397ea043e21850463324052459032071189ec3b015bac93c3e86799550788718",
-                    "mixHash" : "0xa597d178e014f2374356ec1892088566353a9cf618b7478dba14498380a117b0",
-                    "nonce" : "0x9abe17354aad9061",
+                    "hash" : "0x9fedb92c2611bc2ddc7f4dd11702de22b8976f660c93639f76a567ea788fe066",
+                    "mixHash" : "0x4c9280ec179d36e771ef88f3546cbf7364b729fd00aacb1c19d1d82a1243065b",
+                    "nonce" : "0xc76b345041a61c91",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0a597d178e014f2374356ec1892088566353a9cf618b7478dba14498380a117b0889abe17354aad9061f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a04c9280ec179d36e771ef88f3546cbf7364b729fd00aacb1c19d1d82a1243065b88c76b345041a61c91f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x397ea043e21850463324052459032071189ec3b015bac93c3e86799550788718",
+        "lastblockhash" : "0x9fedb92c2611bc2ddc7f4dd11702de22b8976f660c93639f76a567ea788fe066",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -612,8 +492,10 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x2dfff7f4e5dc315fc12c6ee07aaf4e19841014cedcb179b5591d123594fe024a",
-                    "mixHash" : "0x7b5fe392be66d69fbe0a480caab15b01fbd6579023268e456fd8ab1f6b937d09",
-                    "nonce" : "0x03da6c8e0beb2771",
+                    "hash" : "0x8d598a35497ae5887deb92672640a9085a2f61296defd8153b684c4ace04b96e",
+                    "mixHash" : "0x1d542852f2e311dc315e83bacede07d34e40e9912253e2e9635f3a4abd6667ec",
+                    "nonce" : "0x775b3bd5f2edd111",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a07b5fe392be66d69fbe0a480caab15b01fbd6579023268e456fd8ab1f6b937d098803da6c8e0beb2771f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a01d542852f2e311dc315e83bacede07d34e40e9912253e2e9635f3a4abd6667ec88775b3bd5f2edd111f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2dfff7f4e5dc315fc12c6ee07aaf4e19841014cedcb179b5591d123594fe024a",
+        "lastblockhash" : "0x8d598a35497ae5887deb92672640a9085a2f61296defd8153b684c4ace04b96e",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
index b99a2138d..fbf892f35 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallBasic_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0xcfd62b12d81f9d5711b929a0b622c70b7f300fd44c89cbf7200703c9405052b2",
-                    "mixHash" : "0x06e844633b232c56a5a00ad5b2ddbc51f452fe8dea54e50127db46233f74775e",
-                    "nonce" : "0x74ffd2bc74c8ad6c",
+                    "hash" : "0x51bd0915eb1896a3990d7af7fd53a97f1a3630ff4f2ad2e5a4867d773d056897",
+                    "mixHash" : "0x2fb37b7d4e3b26f36b4932f7d51417502391d40634a35b6c597c1f966d0dc091",
+                    "nonce" : "0x30eb955435cd45e5",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0829694e8e4cea18c523674f37505ba0941abc855006879cc2148d5793fc183d5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a006e844633b232c56a5a00ad5b2ddbc51f452fe8dea54e50127db46233f74775e8874ffd2bc74c8ad6cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0829694e8e4cea18c523674f37505ba0941abc855006879cc2148d5793fc183d5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a02fb37b7d4e3b26f36b4932f7d51417502391d40634a35b6c597c1f966d0dc0918830eb955435cd45e5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfd62b12d81f9d5711b929a0b622c70b7f300fd44c89cbf7200703c9405052b2",
+        "lastblockhash" : "0x51bd0915eb1896a3990d7af7fd53a97f1a3630ff4f2ad2e5a4867d773d056897",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "delegatecallBasic_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf137",
-                    "hash" : "0x79b5697a97fdf080872585aa8dfb1a720149308b1b8c757e37ff6aeb6f47546c",
-                    "mixHash" : "0x6aa2427075fc2c464b0412a177870d7fceeab10122807d08095660ca08d4c0a9",
-                    "nonce" : "0xc40a6c00c33e981d",
-                    "number" : "0x01",
-                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
-                    "stateRoot" : "0xf644688363f2011e26bf3f7ab5c5e2c01dea26b21ff916c131ecfbf59aae01ed",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f644688363f2011e26bf3f7ab5c5e2c01dea26b21ff916c131ecfbf59aae01eda03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a06aa2427075fc2c464b0412a177870d7fceeab10122807d08095660ca08d4c0a988c40a6c00c33e981df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "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" : "0x79b5697a97fdf080872585aa8dfb1a720149308b1b8c757e37ff6aeb6f47546c",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cf137",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0x4cd155bbb619e4b33ad84e33e707158bb01e9fff94b3ec05cc9960d9bc2b6e33",
-                    "mixHash" : "0xe40168771e775012410730db17637ec6554d89b29ab3e3f01b637e86b69fd787",
-                    "nonce" : "0x819aba10a582c131",
+                    "hash" : "0x859af26250b232992fe42ccbc376b31c4acc2ab6b112d16436c9bccde36b59a8",
+                    "mixHash" : "0x9a296cfe8da3f47200b2a84a78b40e86308c60b2cff5674c2c8cc09a0cde7e09",
+                    "nonce" : "0xfc06e82838e3db2a",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0e40168771e775012410730db17637ec6554d89b29ab3e3f01b637e86b69fd78788819aba10a582c131f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a09a296cfe8da3f47200b2a84a78b40e86308c60b2cff5674c2c8cc09a0cde7e0988fc06e82838e3db2af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4cd155bbb619e4b33ad84e33e707158bb01e9fff94b3ec05cc9960d9bc2b6e33",
+        "lastblockhash" : "0x859af26250b232992fe42ccbc376b31c4acc2ab6b112d16436c9bccde36b59a8",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -372,8 +248,10 @@
     "delegatecallBasic_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0x75084f7b134d767eeedae627eaf82abc580ccb7d6ec9efb2011f77cea3fe0fca",
-                    "mixHash" : "0xfe2654a69aa95b59fa3c75cdd571f40c33b7daba4f42e91fffc70d457f5b294b",
-                    "nonce" : "0x994c91ebb44dca49",
+                    "hash" : "0x8a68d0965fb291651adf080e1d4cb74aac2a063cb48d4787fe42654aab567e9e",
+                    "mixHash" : "0x54dc7cae9e22993b5f35b472e781631e131a37f1d340645e26bcebe61bfa9ffc",
+                    "nonce" : "0x765a6bbadf629ac1",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0fe2654a69aa95b59fa3c75cdd571f40c33b7daba4f42e91fffc70d457f5b294b88994c91ebb44dca49f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a054dc7cae9e22993b5f35b472e781631e131a37f1d340645e26bcebe61bfa9ffc88765a6bbadf629ac1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75084f7b134d767eeedae627eaf82abc580ccb7d6ec9efb2011f77cea3fe0fca",
+        "lastblockhash" : "0x8a68d0965fb291651adf080e1d4cb74aac2a063cb48d4787fe42654aab567e9e",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -493,8 +371,10 @@
     "delegatecallBasic_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x72a4a25e60c72a170a6d534776f941052e679de9d9808afd6135b9f76d6a1f43",
-                    "mixHash" : "0xad5975d8d29488e7e1f2dd56ff6e601f25c95bc23f8c28b27f0ffe67a409a07a",
-                    "nonce" : "0x876d5abf179c4bdc",
+                    "hash" : "0x92624494859d3aad7e1f1eb3fd2e9ca4ae6dcf9fb2404d3ac780a444d51ace13",
+                    "mixHash" : "0x0ffeebac1eeb88a8c4e9a194b552a1850125f030a47fc136488badd7dda5bab9",
+                    "nonce" : "0x2ff3ef9270bbdf2c",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x5743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fd",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ad5975d8d29488e7e1f2dd56ff6e601f25c95bc23f8c28b27f0ffe67a409a07a88876d5abf179c4bdcf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a00ffeebac1eeb88a8c4e9a194b552a1850125f030a47fc136488badd7dda5bab9882ff3ef9270bbdf2cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72a4a25e60c72a170a6d534776f941052e679de9d9808afd6135b9f76d6a1f43",
+        "lastblockhash" : "0x92624494859d3aad7e1f1eb3fd2e9ca4ae6dcf9fb2404d3ac780a444d51ace13",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -612,8 +492,10 @@
     "delegatecallBasic_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xeea3",
-                    "hash" : "0x0f1f65010c4b4950a57c8c08150788f53e51f39ec86c7ee2be6353df11446e61",
-                    "mixHash" : "0x04c58a1fd4faeaa3a2b75d870ca997179b14aa69b32ba14579e58ab7fde4c3d6",
-                    "nonce" : "0x3fda34e054874b2f",
+                    "hash" : "0x0137d76b148a1a3ff9374ae179130ef6eeec2968aa74676906790d128a7807dc",
+                    "mixHash" : "0xa717e222b9c80d2ed166f61a49ec2f54d1249901cb7cfad569023ff0caba60ad",
+                    "nonce" : "0xda5bd9cba5797511",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4f",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a004c58a1fd4faeaa3a2b75d870ca997179b14aa69b32ba14579e58ab7fde4c3d6883fda34e054874b2ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a0a717e222b9c80d2ed166f61a49ec2f54d1249901cb7cfad569023ff0caba60ad88da5bd9cba5797511f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f1f65010c4b4950a57c8c08150788f53e51f39ec86c7ee2be6353df11446e61",
+        "lastblockhash" : "0x0137d76b148a1a3ff9374ae179130ef6eeec2968aa74676906790d128a7807dc",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
index 6dfdd881e..69366da49 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallEmptycontract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0xb95ac07805f6849ea8ae3b444452a1ef8def9ccec192db7ef90d1a2a6641b716",
-                    "mixHash" : "0x1cd30dc3b4ab2a12f3967497192ab4d1d87f1ab1942013cf5d77fda619ce444b",
-                    "nonce" : "0x9db2898575a2311d",
+                    "hash" : "0x66338ee56588f820051f4399cc6d98853c57e67ab1a27dc8ba3bdfc30a64b77b",
+                    "mixHash" : "0x55d9df87dfa28dd7a384c8aa3530ddef49be605597c0d6a9d76a9b626d412b81",
+                    "nonce" : "0x5fe3742fc0dd6290",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0c9af872597b9e96a995b56dd2371fcd37003a7a8483e7d8275075a6bcca0e0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a01cd30dc3b4ab2a12f3967497192ab4d1d87f1ab1942013cf5d77fda619ce444b889db2898575a2311df862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0c9af872597b9e96a995b56dd2371fcd37003a7a8483e7d8275075a6bcca0e0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a055d9df87dfa28dd7a384c8aa3530ddef49be605597c0d6a9d76a9b626d412b81885fe3742fc0dd6290f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb95ac07805f6849ea8ae3b444452a1ef8def9ccec192db7ef90d1a2a6641b716",
+        "lastblockhash" : "0x66338ee56588f820051f4399cc6d98853c57e67ab1a27dc8ba3bdfc30a64b77b",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -105,124 +107,13 @@
             }
         }
     },
-    "delegatecallEmptycontract_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xa2ff",
-                    "hash" : "0x4630ee454e54e5404fe3a3cd78cd0fbf9f6a41892981b6531259f8fa03457203",
-                    "mixHash" : "0x885f083e2b6e25c11e309cb4d324ec6b9ea716a35f8e365ab0a1189e1951acce",
-                    "nonce" : "0x0dad4dce6d56fdc5",
-                    "number" : "0x01",
-                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
-                    "stateRoot" : "0xfd5b0ffa66d0a11ec5134f955afabb1b93005ec979f44b793501351e2efefea7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd5b0ffa66d0a11ec5134f955afabb1b93005ec979f44b793501351e2efefea7a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0885f083e2b6e25c11e309cb4d324ec6b9ea716a35f8e365ab0a1189e1951acce880dad4dce6d56fdc5f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
-                "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" : "0x4630ee454e54e5404fe3a3cd78cd0fbf9f6a41892981b6531259f8fa03457203",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x03e8",
-                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62ca2ff",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -233,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0x6740876e9f5ac55e316ea0f6fb5c06e345fc11ca38057be7da7d1a574a222af7",
-                    "mixHash" : "0x65705d91964b4bf46bed86518e061211b61d303b9078a9b992e52458f5719e89",
-                    "nonce" : "0x5539265dc33dc4f3",
+                    "hash" : "0xa79b19af3c1faf29eddcf5e7e91f4ec9750f9f45f677388eea83f167bf8050b3",
+                    "mixHash" : "0x95777eeefeffc67c38a1dedebf4670c1af9267f1415109442c44138e3e050824",
+                    "nonce" : "0x978d32c2fbb2f993",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
@@ -244,7 +135,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a065705d91964b4bf46bed86518e061211b61d303b9078a9b992e52458f5719e89885539265dc33dc4f3f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a095777eeefeffc67c38a1dedebf4670c1af9267f1415109442c44138e3e05082488978d32c2fbb2f993f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6740876e9f5ac55e316ea0f6fb5c06e345fc11ca38057be7da7d1a574a222af7",
+        "lastblockhash" : "0xa79b19af3c1faf29eddcf5e7e91f4ec9750f9f45f677388eea83f167bf8050b3",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -327,8 +218,10 @@
     "delegatecallEmptycontract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -339,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0xd22e104a6e8f00b96c3a427fa76c975d7a0a25d7744fdab49a84dfb0f6b1fd6c",
-                    "mixHash" : "0x31d124a3a89112b4fc8a6cc18ebceb46facfc22d45cc8630428612e359acd4b0",
-                    "nonce" : "0x75ec9dcb67db5b9f",
+                    "hash" : "0x2a1eda6855f2a5041e7c63967b72323225eca56e0a6fcd5ca78c25ed3cdd79fd",
+                    "mixHash" : "0x3c66fc08086cdee9794ecf871c4708849814aa1542796d640ad702ba2cd0a11d",
+                    "nonce" : "0x9db83181ad0230ba",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
@@ -350,7 +243,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a031d124a3a89112b4fc8a6cc18ebceb46facfc22d45cc8630428612e359acd4b08875ec9dcb67db5b9ff862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a03c66fc08086cdee9794ecf871c4708849814aa1542796d640ad702ba2cd0a11d889db83181ad0230baf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -387,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd22e104a6e8f00b96c3a427fa76c975d7a0a25d7744fdab49a84dfb0f6b1fd6c",
+        "lastblockhash" : "0x2a1eda6855f2a5041e7c63967b72323225eca56e0a6fcd5ca78c25ed3cdd79fd",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -433,8 +326,10 @@
     "delegatecallEmptycontract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -445,9 +340,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x019a54",
-                    "hash" : "0x85a90dbb55c7d8f8b35be231ebeca58c85ba66dd7878917e172674153d691d22",
-                    "mixHash" : "0x82d4b68c3f78799f844b76b006667aeb372fa6f16f5d71261c44ade34479c9f9",
-                    "nonce" : "0x330b36cc7cc9a619",
+                    "hash" : "0xa712a61e1b9366928e278ea79cc40eac571f6cbc62722ea89acf23c29b90a5c0",
+                    "mixHash" : "0x9a8aa62f96854f17193d337a7ffe4a41bedbb4c798ba6f335100248bfb9e7f63",
+                    "nonce" : "0x343922261fd33db1",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0xee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979",
@@ -456,7 +351,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a082d4b68c3f78799f844b76b006667aeb372fa6f16f5d71261c44ade34479c9f988330b36cc7cc9a619f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a09a8aa62f96854f17193d337a7ffe4a41bedbb4c798ba6f335100248bfb9e7f6388343922261fd33db1f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -493,7 +388,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85a90dbb55c7d8f8b35be231ebeca58c85ba66dd7878917e172674153d691d22",
+        "lastblockhash" : "0xa712a61e1b9366928e278ea79cc40eac571f6cbc62722ea89acf23c29b90a5c0",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -538,8 +433,10 @@
     "delegatecallEmptycontract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -550,9 +447,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa06b",
-                    "hash" : "0x5ac96a3c7ebe28279b6111f20266e7a142f325f8d7ee7c948a18b0c2eb38a7a2",
-                    "mixHash" : "0x89ec06e92f8aec29ad6618e28edc60b0dd03bb70e016d4fe58d80342434610ba",
-                    "nonce" : "0xa032fd9c921ef212",
+                    "hash" : "0x1b8fb7182cc67c33222e85d3797893e98a46ebeae03468928416c141b78796e7",
+                    "mixHash" : "0x3cc77f109388b401572da04d68dddcd2a418efe862767b265073c2bce2be9c93",
+                    "nonce" : "0xd12feac35d4b1dab",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0xe1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abc",
@@ -561,7 +458,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a089ec06e92f8aec29ad6618e28edc60b0dd03bb70e016d4fe58d80342434610ba88a032fd9c921ef212f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a03cc77f109388b401572da04d68dddcd2a418efe862767b265073c2bce2be9c9388d12feac35d4b1dabf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -598,7 +495,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ac96a3c7ebe28279b6111f20266e7a142f325f8d7ee7c948a18b0c2eb38a7a2",
+        "lastblockhash" : "0x1b8fb7182cc67c33222e85d3797893e98a46ebeae03468928416c141b78796e7",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
index 1ec755d8f..2e23c8351 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0x9930f6f5036b6d4c25f190a30b6fc38493a2898c90a4ff4366fa096287578e44",
-                    "mixHash" : "0x6b5f0a81ba5000f0976b34ca1bf84c117479cac6ecddf7c4ce91db499c8eca81",
-                    "nonce" : "0x520aeb1a7731e001",
+                    "hash" : "0x0f30c16d04803971ff7fcb275b0df1ef5e718dc48a3eeab39bd59ac6cbb2d54c",
+                    "mixHash" : "0xf4796183ca7fc704fc0da730ca4032674da560f5a073b9d5021e1ad4b7907204",
+                    "nonce" : "0xd1616e95a4ee1ba3",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac8b32932e36dc9502c7b3418e0e42244bc254a17c7d81b3fc7ffb504df9e529a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a06b5f0a81ba5000f0976b34ca1bf84c117479cac6ecddf7c4ce91db499c8eca8188520aeb1a7731e001f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac8b32932e36dc9502c7b3418e0e42244bc254a17c7d81b3fc7ffb504df9e529a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0f4796183ca7fc704fc0da730ca4032674da560f5a073b9d5021e1ad4b790720488d1616e95a4ee1ba3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9930f6f5036b6d4c25f190a30b6fc38493a2898c90a4ff4366fa096287578e44",
+        "lastblockhash" : "0x0f30c16d04803971ff7fcb275b0df1ef5e718dc48a3eeab39bd59ac6cbb2d54c",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -112,131 +114,13 @@
             }
         }
     },
-    "delegatecallInInitcodeToEmptyContract_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x012020",
-                    "hash" : "0xcf963096c13aa3c6a5cbf1422d9e7e974aa7f5ce7937e74a55aa0ee16c570f50",
-                    "mixHash" : "0xb1830fcb55652f5e979b95082a9478332bffc19a8d6ff921c073b2c807d731fa",
-                    "nonce" : "0x0e1d17344283b2e3",
-                    "number" : "0x01",
-                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
-                    "stateRoot" : "0x3022a0936407654f10557bee8276d0fed3f032aa0d9c4674551dd4a0fb52b5e4",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03022a0936407654f10557bee8276d0fed3f032aa0d9c4674551dd4a0fb52b5e4a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0b1830fcb55652f5e979b95082a9478332bffc19a8d6ff921c073b2c807d731fa880e1d17344283b2e3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "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" : "0xcf963096c13aa3c6a5cbf1422d9e7e974aa7f5ce7937e74a55aa0ee16c570f50",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62d2020",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -247,9 +131,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0x2101eaeaf2c226de37199ce7350d9d7439fe3ba711053208d71a8c719b48aaa5",
-                    "mixHash" : "0xd5a3a539a2ef50b3554bd6c055f68bde698c6420d6ebef9a6ba8a549f8af5f0c",
-                    "nonce" : "0xce329104d54fb766",
+                    "hash" : "0x9c803e61ae22143f84cff31203ff05e3b5d52ec96cf2e9f162677c49f28a1617",
+                    "mixHash" : "0xd12be8a9bcb2b73da59ea7ea349a16ef1cb66fc4bb07fc3aeb5aca89119a4a90",
+                    "nonce" : "0xebe05daf6c6a2237",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x03e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7",
@@ -258,7 +142,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0d5a3a539a2ef50b3554bd6c055f68bde698c6420d6ebef9a6ba8a549f8af5f0c88ce329104d54fb766f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0d12be8a9bcb2b73da59ea7ea349a16ef1cb66fc4bb07fc3aeb5aca89119a4a9088ebe05daf6c6a2237f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -295,7 +179,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2101eaeaf2c226de37199ce7350d9d7439fe3ba711053208d71a8c719b48aaa5",
+        "lastblockhash" : "0x9c803e61ae22143f84cff31203ff05e3b5d52ec96cf2e9f162677c49f28a1617",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -348,8 +232,10 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -360,9 +246,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0xa0590e5ba8b9271333d202f128df43f1760c038dede31070381db670841a2922",
-                    "mixHash" : "0x28436d628d1188e074c89151a617528f9d2c8bd3d4129dc8e0c3293f5d8f3d0d",
-                    "nonce" : "0x83ea7e0364833f9a",
+                    "hash" : "0x829bdb797c9d7bdfb4749c171656681ac139e7a291d3ad859a2c33503f5066d4",
+                    "mixHash" : "0x1bdf88604447541b89b17e94eb5f5a1c870123f273962a7be4fa721be8d01d28",
+                    "nonce" : "0x169e037162a6ee3f",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x26459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712",
@@ -371,7 +257,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a028436d628d1188e074c89151a617528f9d2c8bd3d4129dc8e0c3293f5d8f3d0d8883ea7e0364833f9af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a01bdf88604447541b89b17e94eb5f5a1c870123f273962a7be4fa721be8d01d2888169e037162a6ee3ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -408,7 +294,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0590e5ba8b9271333d202f128df43f1760c038dede31070381db670841a2922",
+        "lastblockhash" : "0x829bdb797c9d7bdfb4749c171656681ac139e7a291d3ad859a2c33503f5066d4",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -461,8 +347,10 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -473,9 +361,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0x4d25167d38507467fd6153ace89c0a285f4e810cf342e7ad14511fabf7702062",
-                    "mixHash" : "0x2969e7c5f893071ac8bba599d586c5feef8cc071e69d494fb040b38774a58d0d",
-                    "nonce" : "0x488c7744e0a8ab72",
+                    "hash" : "0x3393e65f31a23076529993453385273690912b35cfdb1937841e35e4893ea964",
+                    "mixHash" : "0xc8273073c24ebb76a0edf0c8f374516055f994205cd22f4167a192f04697fb46",
+                    "nonce" : "0x40e83f4c2246bc52",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0xcacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219a",
@@ -484,7 +372,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a02969e7c5f893071ac8bba599d586c5feef8cc071e69d494fb040b38774a58d0d88488c7744e0a8ab72f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0c8273073c24ebb76a0edf0c8f374516055f994205cd22f4167a192f04697fb468840e83f4c2246bc52f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -521,7 +409,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d25167d38507467fd6153ace89c0a285f4e810cf342e7ad14511fabf7702062",
+        "lastblockhash" : "0x3393e65f31a23076529993453385273690912b35cfdb1937841e35e4893ea964",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -566,8 +454,10 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -578,9 +468,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d8c",
-                    "hash" : "0x77c0fe2d65d7f067b68aa7c430e5409a23d21eaafebafe377e9f3431f3adf081",
-                    "mixHash" : "0x42ec0ebed86edad12df6770f1a070c0319f7aa174b0415f9902776c099dc8d8e",
-                    "nonce" : "0xc68e2fc2813764ac",
+                    "hash" : "0x870f8f0347309094a2dab17409213dd502deb130b73369ffd20ca5f4adfee4f9",
+                    "mixHash" : "0x17cdf3eb0d85c47cfe529b75f2ff258fee99b3c6f4f8f9b75b350345d58b655e",
+                    "nonce" : "0xa1fdf1e0ca153875",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x67210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80",
@@ -589,7 +479,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a042ec0ebed86edad12df6770f1a070c0319f7aa174b0415f9902776c099dc8d8e88c68e2fc2813764acf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a017cdf3eb0d85c47cfe529b75f2ff258fee99b3c6f4f8f9b75b350345d58b655e88a1fdf1e0ca153875f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -626,7 +516,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77c0fe2d65d7f067b68aa7c430e5409a23d21eaafebafe377e9f3431f3adf081",
+        "lastblockhash" : "0x870f8f0347309094a2dab17409213dd502deb130b73369ffd20ca5f4adfee4f9",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
index d2b05a6c5..b7834c723 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0x2eb914c5d588baf1345e782df31a01c97ed7d19d58faacd6a22d95ac4fb7837a",
-                    "mixHash" : "0x3e00035c33d65945a91e96c46673455711f513f7aaad3068b94429b823b58482",
-                    "nonce" : "0x0ffac17fefcd987c",
+                    "hash" : "0x9725e10c5b5108b96266ba64af406ce2a411f4d6407c10d6a1a995c365af99bb",
+                    "mixHash" : "0x434fa76e1a63c29e8033a4177f41388f526a35cc260ca0643bbc5a896b727128",
+                    "nonce" : "0xf3ee26c7d4e75f2f",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b91fe7501f4c0c837cfd69c2ad2efd207a6a460e3a68fd18d6afad3451376ed1a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a03e00035c33d65945a91e96c46673455711f513f7aaad3068b94429b823b58482880ffac17fefcd987cf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b91fe7501f4c0c837cfd69c2ad2efd207a6a460e3a68fd18d6afad3451376ed1a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0434fa76e1a63c29e8033a4177f41388f526a35cc260ca0643bbc5a896b72712888f3ee26c7d4e75f2ff862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2eb914c5d588baf1345e782df31a01c97ed7d19d58faacd6a22d95ac4fb7837a",
+        "lastblockhash" : "0x9725e10c5b5108b96266ba64af406ce2a411f4d6407c10d6a1a995c365af99bb",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -128,147 +130,13 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01bc6b",
-                    "hash" : "0x8b2fa37fd831bc276d24f56e3a87345cef429e2c0ab94c95828cd3839391b828",
-                    "mixHash" : "0xe8a2358e224e5f37e3f9d21c7d1e537473c3856111ca94ca8c561b9af848be6c",
-                    "nonce" : "0x786615d70af31ed0",
-                    "number" : "0x01",
-                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
-                    "stateRoot" : "0x78afdee3b49eecbcfec715b22f3c6e5c52094940f80a4701f05a5b46019982ab",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078afdee3b49eecbcfec715b22f3c6e5c52094940f80a4701f05a5b46019982aba0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0e8a2358e224e5f37e3f9d21c7d1e537473c3856111ca94ca8c561b9af848be6c88786615d70af31ed0f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
-                "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" : "0x8b2fa37fd831bc276d24f56e3a87345cef429e2c0ab94c95828cd3839391b828",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "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.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -279,9 +147,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0x6627bcbabd9c8e5404e50138c8e00487a89c05b36bcb9202fde4003dcbb7d241",
-                    "mixHash" : "0x1b691ef16930c2845a0e0dc4b27cb48c5fd917034f79bc344560788e2b3455bc",
-                    "nonce" : "0xf3ce341efa1dc923",
+                    "hash" : "0x18650b7fb1d298a50d9a25b009e3da4e9fb7c113ec30dc7be4d757d430263e59",
+                    "mixHash" : "0x7ea718160b99c9aabb7c46d61e9e9c27f89009b1ad813d593891bc1ec0674bc5",
+                    "nonce" : "0xf88be0c0e54c391a",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0xd8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80",
@@ -290,7 +158,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a01b691ef16930c2845a0e0dc4b27cb48c5fd917034f79bc344560788e2b3455bc88f3ce341efa1dc923f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a07ea718160b99c9aabb7c46d61e9e9c27f89009b1ad813d593891bc1ec0674bc588f88be0c0e54c391af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -327,7 +195,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6627bcbabd9c8e5404e50138c8e00487a89c05b36bcb9202fde4003dcbb7d241",
+        "lastblockhash" : "0x18650b7fb1d298a50d9a25b009e3da4e9fb7c113ec30dc7be4d757d430263e59",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -396,8 +264,10 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -408,9 +278,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0x1480e2dd2d26338724f4f83f5ca8c5e415138c58a14ea951c31b6c39ffea9dc8",
-                    "mixHash" : "0xd0282f35ab8f59df6d84e4ec8f745ef21b3ad913e5fce6bdacafe37ff101cc1e",
-                    "nonce" : "0xd96d75b24c1f663c",
+                    "hash" : "0xc348bd5a9d31ea5ec6ff07a585db711c40f8f70f1ced716e009decd0f437891e",
+                    "mixHash" : "0xd3d3c90199b0a7ac245c6d2a0fc90670b2ac63572b1500154b26bcc9fc0766a5",
+                    "nonce" : "0xe2e4906f65a62a6a",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0x9e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6",
@@ -419,7 +289,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0d0282f35ab8f59df6d84e4ec8f745ef21b3ad913e5fce6bdacafe37ff101cc1e88d96d75b24c1f663cf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0d3d3c90199b0a7ac245c6d2a0fc90670b2ac63572b1500154b26bcc9fc0766a588e2e4906f65a62a6af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -456,7 +326,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1480e2dd2d26338724f4f83f5ca8c5e415138c58a14ea951c31b6c39ffea9dc8",
+        "lastblockhash" : "0xc348bd5a9d31ea5ec6ff07a585db711c40f8f70f1ced716e009decd0f437891e",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -525,8 +395,10 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -537,9 +409,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x025608",
-                    "hash" : "0xd749f5c711c8607beeb66f8adfe204efc47761b0d740151a9d93055990c3eed7",
-                    "mixHash" : "0xb4a9587ea15bd261e8e7d80c99011f86fcd2aefdc39f68f24b390e1b20128f6b",
-                    "nonce" : "0x918e8802deb65375",
+                    "hash" : "0x15f63a86143fb6bab619c215f4a2e9caee9ce42e07120993ff675f6f060d1dba",
+                    "mixHash" : "0xf6b5a2f159223a61787ab4d5e422d9faa96b7681d7ad1d4fd3b8331b45b6b4ba",
+                    "nonce" : "0x7e91dee7465877fe",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
@@ -548,7 +420,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0b4a9587ea15bd261e8e7d80c99011f86fcd2aefdc39f68f24b390e1b20128f6b88918e8802deb65375f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0f6b5a2f159223a61787ab4d5e422d9faa96b7681d7ad1d4fd3b8331b45b6b4ba887e91dee7465877fef862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -585,7 +457,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd749f5c711c8607beeb66f8adfe204efc47761b0d740151a9d93055990c3eed7",
+        "lastblockhash" : "0x15f63a86143fb6bab619c215f4a2e9caee9ce42e07120993ff675f6f060d1dba",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -644,8 +516,10 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -656,9 +530,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x025608",
-                    "hash" : "0x977eff931f830f1b397f6c2e23f9976257ee5999ba7f76e87b467e51a29bae92",
-                    "mixHash" : "0x311a1f71fbf69e5e9416769fe958b64202ca440a0dce6a959e9528b2229d51f5",
-                    "nonce" : "0x488a3064f9efaf6a",
+                    "hash" : "0x6f8baca385e0dc6c6eeac673a6b813fdeff2df44d52359d4aa0457f538fd6d6c",
+                    "mixHash" : "0xbcf9291dd1ca153a250e1ef0370e5eca69ad941a0893fb5e4f5208043c9b88f8",
+                    "nonce" : "0xe91026f87c7d1d3b",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
@@ -667,7 +541,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0311a1f71fbf69e5e9416769fe958b64202ca440a0dce6a959e9528b2229d51f588488a3064f9efaf6af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0bcf9291dd1ca153a250e1ef0370e5eca69ad941a0893fb5e4f5208043c9b88f888e91026f87c7d1d3bf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -704,7 +578,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x977eff931f830f1b397f6c2e23f9976257ee5999ba7f76e87b467e51a29bae92",
+        "lastblockhash" : "0x6f8baca385e0dc6c6eeac673a6b813fdeff2df44d52359d4aa0457f538fd6d6c",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
index 648df7f74..96fe90d08 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0xdc1b4ad65953f14c3e4a2e0fa355c9f876d8acaf08223454a8995923d9889dab",
-                    "mixHash" : "0xeef0ac95115faf0e265853a8f8437544076d812cc672782156963ee6e0092925",
-                    "nonce" : "0x0a3dff322d81cadf",
+                    "hash" : "0x7850a2b7de2ba7ff859407a36782647e40f14a4afbea92257b05d7041f64b5ba",
+                    "mixHash" : "0xdf43d4d51d18b50c8c914996960a2a2f6e267f3f0ca6f19f3e8d185174f7dcc7",
+                    "nonce" : "0x5ec25a9001d29b44",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05696e3700fe35114f2c429562113e0a3920ae810d929b5a1576edd994facd5f5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0eef0ac95115faf0e265853a8f8437544076d812cc672782156963ee6e0092925880a3dff322d81cadff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05696e3700fe35114f2c429562113e0a3920ae810d929b5a1576edd994facd5f5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0df43d4d51d18b50c8c914996960a2a2f6e267f3f0ca6f19f3e8d185174f7dcc7885ec25a9001d29b44f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc1b4ad65953f14c3e4a2e0fa355c9f876d8acaf08223454a8995923d9889dab",
+        "lastblockhash" : "0x7850a2b7de2ba7ff859407a36782647e40f14a4afbea92257b05d7041f64b5ba",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -143,162 +145,13 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContract_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x020a90",
-                    "hash" : "0x8532070c0917c7a7639aee7b9404fb270d068966ade1cb032406316e2e95ad34",
-                    "mixHash" : "0x398bc773c9be947cef23308715d6102875a1492272f7454be2b3c5b09a39e36b",
-                    "nonce" : "0x047d671fe669be10",
-                    "number" : "0x01",
-                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
-                    "stateRoot" : "0xded7e4699dcae6c9567d4137ba2c6e3259f236cbdcd3af88546be6cee218e408",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ded7e4699dcae6c9567d4137ba2c6e3259f236cbdcd3af88546be6cee218e408a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0398bc773c9be947cef23308715d6102875a1492272f7454be2b3c5b09a39e36b88047d671fe669be10f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "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" : "0x8532070c0917c7a7639aee7b9404fb270d068966ade1cb032406316e2e95ad34",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "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" : "0x29a2241af62e0a90",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -309,9 +162,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0xa984aa46bdf0566238ef33ab4b41c2c7a197c99b66580c8c07ae4477b9afe04b",
-                    "mixHash" : "0x8bc43c1f6a30fd1100afcfe8fa5254359b6991e846e6bce161963b8f9855e206",
-                    "nonce" : "0x433a5e576e75efdc",
+                    "hash" : "0xe142605e8be30ed37960c18ea31e7d67573c0e88195079ca56a7fed97fa4fd97",
+                    "mixHash" : "0xb1e136f22fbb55abfe1e97f247a514db29401a0996a50ac9528b2dabe138a4b4",
+                    "nonce" : "0x78aff47aa4f21107",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x89a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64",
@@ -320,7 +173,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a08bc43c1f6a30fd1100afcfe8fa5254359b6991e846e6bce161963b8f9855e20688433a5e576e75efdcf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0b1e136f22fbb55abfe1e97f247a514db29401a0996a50ac9528b2dabe138a4b48878aff47aa4f21107f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -357,7 +210,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa984aa46bdf0566238ef33ab4b41c2c7a197c99b66580c8c07ae4477b9afe04b",
+        "lastblockhash" : "0xe142605e8be30ed37960c18ea31e7d67573c0e88195079ca56a7fed97fa4fd97",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -441,8 +294,10 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -453,9 +308,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0x344d4d8d0cf624d65c9550aec182cf3a5a2649b11a28ec95b1faff220a1b6cde",
-                    "mixHash" : "0x2f7af7da6af9612546fbcc58b4e8b0bf68e1d82602fa30f0349b8149f9aab98d",
-                    "nonce" : "0xa5efea1bcf39cfa2",
+                    "hash" : "0xe52822b92e420486b07e2d0d5d2fc7a63392f42253c74122aeaad5ff204efe65",
+                    "mixHash" : "0xf83ec2ccc0189545a293fade1799ce19e641bfe05ddef79eff55baeae7e071a0",
+                    "nonce" : "0x93c23e041c28952f",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8",
@@ -464,7 +319,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a02f7af7da6af9612546fbcc58b4e8b0bf68e1d82602fa30f0349b8149f9aab98d88a5efea1bcf39cfa2f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0f83ec2ccc0189545a293fade1799ce19e641bfe05ddef79eff55baeae7e071a08893c23e041c28952ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -501,7 +356,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x344d4d8d0cf624d65c9550aec182cf3a5a2649b11a28ec95b1faff220a1b6cde",
+        "lastblockhash" : "0xe52822b92e420486b07e2d0d5d2fc7a63392f42253c74122aeaad5ff204efe65",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -585,8 +440,10 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -597,9 +454,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0xa9da606c8a5e0b035283ee3692fea084d58b33f5dcb68ce9a5bb5b2c840bfd30",
-                    "mixHash" : "0x6efdf44e4c4240ad4dabcdc63775339bf11c87df87b1646aee69d4160be1bbde",
-                    "nonce" : "0xe13bb5f100da131b",
+                    "hash" : "0xb8900fce3a6a9a91b0b3a068220951dba9289e939a50678d9524f1d2d2022bdf",
+                    "mixHash" : "0x2fdc305bd8cf40e349e3e727b09fcee590512564703b7ff48a33467d978c2960",
+                    "nonce" : "0xf0fa585985d37c92",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13c",
@@ -608,7 +465,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a06efdf44e4c4240ad4dabcdc63775339bf11c87df87b1646aee69d4160be1bbde88e13bb5f100da131bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a02fdc305bd8cf40e349e3e727b09fcee590512564703b7ff48a33467d978c296088f0fa585985d37c92f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -645,7 +502,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9da606c8a5e0b035283ee3692fea084d58b33f5dcb68ce9a5bb5b2c840bfd30",
+        "lastblockhash" : "0xb8900fce3a6a9a91b0b3a068220951dba9289e939a50678d9524f1d2d2022bdf",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -718,8 +575,10 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -730,9 +589,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0207fc",
-                    "hash" : "0x0deca4d57820c0015de90fcd27a32679978a7d7fa199a1176b48b69736e2f3f3",
-                    "mixHash" : "0x6bc9b9a71710b5243b467ba5a4b1417b109315a1924c90e73a0edf9ac62852f8",
-                    "nonce" : "0x9ed3ff1f7db3599b",
+                    "hash" : "0x80971ab6687f2bd5f4c2feb0c867b8a2a83d45376090e49099cbd9bbd826e992",
+                    "mixHash" : "0xf06b81927da6352ee24d6c073115eb5754f53f5580eed2493bd3955bc30f4e67",
+                    "nonce" : "0xee3e4018fc5fe084",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x2530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050",
@@ -741,7 +600,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a06bc9b9a71710b5243b467ba5a4b1417b109315a1924c90e73a0edf9ac62852f8889ed3ff1f7db3599bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a0f06b81927da6352ee24d6c073115eb5754f53f5580eed2493bd3955bc30f4e6788ee3e4018fc5fe084f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -778,7 +637,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0deca4d57820c0015de90fcd27a32679978a7d7fa199a1176b48b69736e2f3f3",
+        "lastblockhash" : "0x80971ab6687f2bd5f4c2feb0c867b8a2a83d45376090e49099cbd9bbd826e992",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
index 6dd029581..85a106293 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallOOGinCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0x7f2a863061fb770937fb92b7d84053e8951a6a83d6f5b68834758a91c3595a1e",
-                    "mixHash" : "0x65ba93fa66ac92168e7456abd7cbbfb67c2cf29d8ebd5349632d46cbb927eaf7",
-                    "nonce" : "0x1881d7a4742caa79",
+                    "hash" : "0x541f8b811fc96cdbeaef4753139ed1e4e97df1700a2146d34f37eb80b8dc40d4",
+                    "mixHash" : "0x851e44981b1e1c0e10825dff9a609f17fbe4c460f63e030b2bef8fd152f64047",
+                    "nonce" : "0x69959afe7118410f",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01de1227018684e7eba17a6fd3d02601c7512967b3ce6d7abee2d02ff1b815a2da03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a065ba93fa66ac92168e7456abd7cbbfb67c2cf29d8ebd5349632d46cbb927eaf7881881d7a4742caa79f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01de1227018684e7eba17a6fd3d02601c7512967b3ce6d7abee2d02ff1b815a2da03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0851e44981b1e1c0e10825dff9a609f17fbe4c460f63e030b2bef8fd152f640478869959afe7118410ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7f2a863061fb770937fb92b7d84053e8951a6a83d6f5b68834758a91c3595a1e",
+        "lastblockhash" : "0x541f8b811fc96cdbeaef4753139ed1e4e97df1700a2146d34f37eb80b8dc40d4",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -119,138 +121,13 @@
             }
         }
     },
-    "delegatecallOOGinCall_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xca0f",
-                    "hash" : "0x3f0a8dd7c2726aab2d32789c375fa31ef5c722fd6c1dc12b755bfeae91a668f7",
-                    "mixHash" : "0x7e4ba49f842b8043f4ab5b391674c33e1fac095c36734751381b3ebc0be363f4",
-                    "nonce" : "0xb6a85f2d33c0a365",
-                    "number" : "0x01",
-                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
-                    "stateRoot" : "0x20b140678b95e5d67478398d143dd8cb19426dddea768ec66577385e101b501e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020b140678b95e5d67478398d143dd8cb19426dddea768ec66577385e101b501ea03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a07e4ba49f842b8043f4ab5b391674c33e1fac095c36734751381b3ebc0be363f488b6a85f2d33c0a365f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "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" : "0x3f0a8dd7c2726aab2d32789c375fa31ef5c722fd6c1dc12b755bfeae91a668f7",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cca0f",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -261,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0xb86d62eff3239922a56058e621d0daec6ae2497e2fc9615098596a0206373870",
-                    "mixHash" : "0x21a7a17331267c73958ae9ee80db884105f421f104827719bf31a187465fe81b",
-                    "nonce" : "0x15e7470b84d20463",
+                    "hash" : "0x66be84264e786e96d0290c5a4cbe3d6075b2c2db22ccadf9019e60867032abda",
+                    "mixHash" : "0x61026fc8bac7ace785cdaee63ecf1f8aad66b3bf5f8228d108be1d52b8fe7667",
+                    "nonce" : "0xcca15131577534b5",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
@@ -272,7 +149,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a021a7a17331267c73958ae9ee80db884105f421f104827719bf31a187465fe81b8815e7470b84d20463f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a061026fc8bac7ace785cdaee63ecf1f8aad66b3bf5f8228d108be1d52b8fe766788cca15131577534b5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -309,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb86d62eff3239922a56058e621d0daec6ae2497e2fc9615098596a0206373870",
+        "lastblockhash" : "0x66be84264e786e96d0290c5a4cbe3d6075b2c2db22ccadf9019e60867032abda",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -369,8 +246,10 @@
     "delegatecallOOGinCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -381,9 +260,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0xfb641c1b41904aeeddb4bbd49aeb1ca79da1ae403e5a118af6f03157a8bacda2",
-                    "mixHash" : "0x111e9d6d0e795873f8b644f93e601a2409ea2691de95095ca010bf350df9c838",
-                    "nonce" : "0x48e7658c583a89e1",
+                    "hash" : "0xeea9f96ed6af4ee06cae8ef49ce8b38f52fcf2af2cb46727728af3d90b35bc79",
+                    "mixHash" : "0x1423e4d4588d3fa88077ded1b788d9c5ab91a66782537270528268fd17da226a",
+                    "nonce" : "0xda22e11f6dcae339",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
@@ -392,7 +271,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0111e9d6d0e795873f8b644f93e601a2409ea2691de95095ca010bf350df9c8388848e7658c583a89e1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a01423e4d4588d3fa88077ded1b788d9c5ab91a66782537270528268fd17da226a88da22e11f6dcae339f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -429,7 +308,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb641c1b41904aeeddb4bbd49aeb1ca79da1ae403e5a118af6f03157a8bacda2",
+        "lastblockhash" : "0xeea9f96ed6af4ee06cae8ef49ce8b38f52fcf2af2cb46727728af3d90b35bc79",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -489,8 +368,10 @@
     "delegatecallOOGinCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -501,9 +382,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x633d23e0499a60c5bb758f258897069ce1921b48b28a168e432392a433ec813a",
-                    "mixHash" : "0xc0aa633c83e66553b8d6a1f35dc44b5f1712ff776c70988c3ae9a23405629605",
-                    "nonce" : "0xc10cc0c579ab1890",
+                    "hash" : "0x101732a578e95b38df17f56b5d21a1f4b2fa4e5ef187ab0bf06c4b5b2268f2eb",
+                    "mixHash" : "0xc3d8a6ff37c566d707d0c539b061946cd801ce1dfc8872ac41ce559385a0cc5a",
+                    "nonce" : "0xc1e9a075b29ba2e4",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x8e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36",
@@ -512,7 +393,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c0aa633c83e66553b8d6a1f35dc44b5f1712ff776c70988c3ae9a2340562960588c10cc0c579ab1890f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c3d8a6ff37c566d707d0c539b061946cd801ce1dfc8872ac41ce559385a0cc5a88c1e9a075b29ba2e4f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -549,7 +430,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x633d23e0499a60c5bb758f258897069ce1921b48b28a168e432392a433ec813a",
+        "lastblockhash" : "0x101732a578e95b38df17f56b5d21a1f4b2fa4e5ef187ab0bf06c4b5b2268f2eb",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -608,8 +489,10 @@
     "delegatecallOOGinCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -620,9 +503,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xc77b",
-                    "hash" : "0x077a3841d1085f9444350524d38697a26d49772a81e266d62d4f66897c5300de",
-                    "mixHash" : "0xae31f553a6abe9769f50ef2a36f657fef9ac5584e5440ec29cf09255d009a449",
-                    "nonce" : "0x254f1dc914ba8059",
+                    "hash" : "0x5823da405a75c4bc3954ecfdcca000a082aa8105fd8387fe14126cd7bf8474f9",
+                    "mixHash" : "0x6c6c624757419e1fe8660d7da5d6e78097180922f1f5ffd8651b70cce76869b6",
+                    "nonce" : "0x72b6b0c9fc575239",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x6320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982",
@@ -631,7 +514,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a0ae31f553a6abe9769f50ef2a36f657fef9ac5584e5440ec29cf09255d009a44988254f1dc914ba8059f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a06c6c624757419e1fe8660d7da5d6e78097180922f1f5ffd8651b70cce76869b68872b6b0c9fc575239f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -668,7 +551,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x077a3841d1085f9444350524d38697a26d49772a81e266d62d4f66897c5300de",
+        "lastblockhash" : "0x5823da405a75c4bc3954ecfdcca000a082aa8105fd8387fe14126cd7bf8474f9",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
index 8a58324ef..dcbf9155a 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallSenderCheck_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0x8da900be13abce9625cb25a48deed6cd8704a648debfb01ad2453cd6502e009b",
-                    "mixHash" : "0x4ced3dc7915b0ab30383aef30c6b1c327464c8761bfd8cc2868d446ad2a73d7a",
-                    "nonce" : "0x0634eb4959a1b89f",
+                    "hash" : "0xdaae173987e0b4cb47da9df0bae77bd3b3296753203d8ade8436a38901f5383e",
+                    "mixHash" : "0x2cce51db5e9e4fb1873762c8dc8db53f5d688ff676f0e7ee7a8b5e3182da0c79",
+                    "nonce" : "0x393ceeb1c66d5727",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094c83508236a1671dd08b3b34b44830a1117f60e6d7d2ae7e341dc3c7bd289baa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a04ced3dc7915b0ab30383aef30c6b1c327464c8761bfd8cc2868d446ad2a73d7a880634eb4959a1b89ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094c83508236a1671dd08b3b34b44830a1117f60e6d7d2ae7e341dc3c7bd289baa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a02cce51db5e9e4fb1873762c8dc8db53f5d688ff676f0e7ee7a8b5e3182da0c7988393ceeb1c66d5727f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8da900be13abce9625cb25a48deed6cd8704a648debfb01ad2453cd6502e009b",
+        "lastblockhash" : "0xdaae173987e0b4cb47da9df0bae77bd3b3296753203d8ade8436a38901f5383e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "delegatecallSenderCheck_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf124",
-                    "hash" : "0xfde09374f8b1f082998f9123f5c11cfe6d9c8d4faac87541d23f79418539328c",
-                    "mixHash" : "0x52dbef581127e14ad70d68fc75c9246012af3df4b407da8c9eaae1ab25737e11",
-                    "nonce" : "0x46ad386d79603f21",
-                    "number" : "0x01",
-                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
-                    "stateRoot" : "0xa892703d074c1111926f7d220ce68d13c2f9fa87246329ccc84b236cffc70e98",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a892703d074c1111926f7d220ce68d13c2f9fa87246329ccc84b236cffc70e98a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a052dbef581127e14ad70d68fc75c9246012af3df4b407da8c9eaae1ab25737e118846ad386d79603f21f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "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" : "0xfde09374f8b1f082998f9123f5c11cfe6d9c8d4faac87541d23f79418539328c",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cf124",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xbf351e232b4c04cd688e80a4f32a698cf1356383ab80f3e2c57e66c1394559ca",
-                    "mixHash" : "0x45df34966085a748553c1ae44d395950aa40742d0eac1788e9bd6b7f0f32f294",
-                    "nonce" : "0x7d9a313f26fe1925",
+                    "hash" : "0xd7f5ddad97dae12c090222384dc09f45805985bbfe1598f69fcba25f48004c59",
+                    "mixHash" : "0x5b0112edf8576cd9cf43c666b2c525c846e1417f9223d19c7b12a554fc11bdb6",
+                    "nonce" : "0xa2545266708ec6e4",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a045df34966085a748553c1ae44d395950aa40742d0eac1788e9bd6b7f0f32f294887d9a313f26fe1925f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a05b0112edf8576cd9cf43c666b2c525c846e1417f9223d19c7b12a554fc11bdb688a2545266708ec6e4f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf351e232b4c04cd688e80a4f32a698cf1356383ab80f3e2c57e66c1394559ca",
+        "lastblockhash" : "0xd7f5ddad97dae12c090222384dc09f45805985bbfe1598f69fcba25f48004c59",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -372,8 +248,10 @@
     "delegatecallSenderCheck_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0x24d3e4f7f16b1ed2a09269c25e813d8eadb567b8159756bcc50125a1d72de4ec",
-                    "mixHash" : "0x52b4a442f27fe3ca9d64717fb28dbc451eecaae5e44fb0f7d13b95da01529367",
-                    "nonce" : "0xa97692f5f4d9a6be",
+                    "hash" : "0xc6f285e8f009e86ed0c6835e4f25b996314a0a87c76ad9b654468f94dec5f4ca",
+                    "mixHash" : "0x8df3d192a6bfa45116f27fe7e6c09b38fb19e50f2223b48ab38537180462589b",
+                    "nonce" : "0xa61a9aacee993132",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a052b4a442f27fe3ca9d64717fb28dbc451eecaae5e44fb0f7d13b95da0152936788a97692f5f4d9a6bef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a08df3d192a6bfa45116f27fe7e6c09b38fb19e50f2223b48ab38537180462589b88a61a9aacee993132f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24d3e4f7f16b1ed2a09269c25e813d8eadb567b8159756bcc50125a1d72de4ec",
+        "lastblockhash" : "0xc6f285e8f009e86ed0c6835e4f25b996314a0a87c76ad9b654468f94dec5f4ca",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -493,8 +371,10 @@
     "delegatecallSenderCheck_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x958cec7b3494c046da60f59763ad2777ff929d2ffc78ae7ed3467c2e0d7322b0",
-                    "mixHash" : "0xcc5539d78bded0556e7853167e8fbefe61792711c3e82f42be715f27e702bbcf",
-                    "nonce" : "0xd62466619073dba6",
+                    "hash" : "0x71c6b67622d339c84a0ae31b39585d0d38191dc3c3fb3113289f52d97b01514d",
+                    "mixHash" : "0xdf0566388a1136666d5c098f35e3c585e61b50904a54c0d49bf6152d8d255318",
+                    "nonce" : "0x263fe6d91ef8609d",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0x8815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2b",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0cc5539d78bded0556e7853167e8fbefe61792711c3e82f42be715f27e702bbcf88d62466619073dba6f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0df0566388a1136666d5c098f35e3c585e61b50904a54c0d49bf6152d8d25531888263fe6d91ef8609df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x958cec7b3494c046da60f59763ad2777ff929d2ffc78ae7ed3467c2e0d7322b0",
+        "lastblockhash" : "0x71c6b67622d339c84a0ae31b39585d0d38191dc3c3fb3113289f52d97b01514d",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -612,8 +492,10 @@
     "delegatecallSenderCheck_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xee90",
-                    "hash" : "0x7fca38fa9d9e0be0337d9659006ddec35e2fd791d420c99e24e6d67a898c4cc8",
-                    "mixHash" : "0x2c4cb40516fc4851d57fe59178666d6fbe85dbd7791cdbc220b268b67b625f7d",
-                    "nonce" : "0x1f52648dd84aa264",
+                    "hash" : "0x6c0908c2bf091ee9a4d6f43645800164b709db3550309c3ff809e0a3246807ea",
+                    "mixHash" : "0x13e63ec4e9ac7f2989f9ad3420289e619af83dfd7275a7e42fcc0703f83ba5db",
+                    "nonce" : "0x0e7851eee3cc26a7",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0x7ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a02c4cb40516fc4851d57fe59178666d6fbe85dbd7791cdbc220b268b67b625f7d881f52648dd84aa264f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a013e63ec4e9ac7f2989f9ad3420289e619af83dfd7275a7e42fcc0703f83ba5db880e7851eee3cc26a7f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7fca38fa9d9e0be0337d9659006ddec35e2fd791d420c99e24e6d67a898c4cc8",
+        "lastblockhash" : "0x6c0908c2bf091ee9a4d6f43645800164b709db3550309c3ff809e0a3246807ea",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
index dc1616fd0..2bda4b741 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecallValueCheck_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xfec48660b4f6f81398383d18d844a514572e592c53e214572820744c0c7f254f",
-                    "mixHash" : "0xcc507c3ef0a0cdb0fc1581018fffc0e6cc66ba7a3cfb05330347266d73cc8a76",
-                    "nonce" : "0x4089a473a5fba544",
+                    "hash" : "0xe3589b5488543f47042a950f720ad69d4bcd62804bd31bf3a9dbd619a48d66a2",
+                    "mixHash" : "0xba76a2610f5f5baba338d6f7598cbaaaa582307ba4527f5893fd136c8970cc71",
+                    "nonce" : "0xc13cedf665a4a34e",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05329109f0a15c20aebcad2e9f5b98efc9cfef0a1ce0fdf123eeaf3dff3b65c5ba0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0cc507c3ef0a0cdb0fc1581018fffc0e6cc66ba7a3cfb05330347266d73cc8a76884089a473a5fba544f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05329109f0a15c20aebcad2e9f5b98efc9cfef0a1ce0fdf123eeaf3dff3b65c5ba0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0ba76a2610f5f5baba338d6f7598cbaaaa582307ba4527f5893fd136c8970cc7188c13cedf665a4a34ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfec48660b4f6f81398383d18d844a514572e592c53e214572820744c0c7f254f",
+        "lastblockhash" : "0xe3589b5488543f47042a950f720ad69d4bcd62804bd31bf3a9dbd619a48d66a2",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "delegatecallValueCheck_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf124",
-                    "hash" : "0xa7cb9bc31bea7e1f3e8b27e21260b6a1f6f7e0b88c32bd28613cf3f0b08c967f",
-                    "mixHash" : "0x4bd1d63ebe4175b009d0e96454b9ce2784d90514b85007f90cfbea065af82eb4",
-                    "nonce" : "0x09cefb5e4ade9ec6",
-                    "number" : "0x01",
-                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
-                    "stateRoot" : "0x4239b08927c1663a6809efbea0cf1f2e5881e3d5295a75e00f2bc84814416a91",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04239b08927c1663a6809efbea0cf1f2e5881e3d5295a75e00f2bc84814416a91a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a04bd1d63ebe4175b009d0e96454b9ce2784d90514b85007f90cfbea065af82eb48809cefb5e4ade9ec6f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
-                "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" : "0xa7cb9bc31bea7e1f3e8b27e21260b6a1f6f7e0b88c32bd28613cf3f0b08c967f",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640017",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x17"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cf124",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xfc951bbdf40d60b29aa4d51a04bd0467815b60a59926e51488aafd503e4b82a4",
-                    "mixHash" : "0x48d43a9fad23e04eb8663e0366a03ec4eefc7d7616500079a27b88d0262654ee",
-                    "nonce" : "0xd97767c6c9bbba3d",
+                    "hash" : "0x80a6d4b3902c612df78371f89fd93973ebbddfb219299c4b5f2a646722915326",
+                    "mixHash" : "0x3af47ad2596e9f02626743437edf4ef003413d968b3c2f823fef2f311f0d8803",
+                    "nonce" : "0x7106af0007bfef77",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a048d43a9fad23e04eb8663e0366a03ec4eefc7d7616500079a27b88d0262654ee88d97767c6c9bbba3df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a03af47ad2596e9f02626743437edf4ef003413d968b3c2f823fef2f311f0d8803887106af0007bfef77f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc951bbdf40d60b29aa4d51a04bd0467815b60a59926e51488aafd503e4b82a4",
+        "lastblockhash" : "0x80a6d4b3902c612df78371f89fd93973ebbddfb219299c4b5f2a646722915326",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -372,8 +248,10 @@
     "delegatecallValueCheck_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -384,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xd65b653097778eefdc1f05aeb21798a50d115382be68a9cdf37e723818e614fb",
-                    "mixHash" : "0x5e3c45af619d7524264b3cf12f2f6b876e31803be93de72c5459e13de1eb00ce",
-                    "nonce" : "0x333ce8eef57cc5ea",
+                    "hash" : "0x109141b9a4695f787e2f94bf79e07abeb0fd5598a087caa16af86f1c45239325",
+                    "mixHash" : "0x67326c2d8a4d20464ce332e1a54066e52c11fabc9bf2d97bd2ec58141a44df66",
+                    "nonce" : "0x7ae4920d2dba2639",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
@@ -395,7 +273,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a05e3c45af619d7524264b3cf12f2f6b876e31803be93de72c5459e13de1eb00ce88333ce8eef57cc5eaf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a067326c2d8a4d20464ce332e1a54066e52c11fabc9bf2d97bd2ec58141a44df66887ae4920d2dba2639f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -432,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd65b653097778eefdc1f05aeb21798a50d115382be68a9cdf37e723818e614fb",
+        "lastblockhash" : "0x109141b9a4695f787e2f94bf79e07abeb0fd5598a087caa16af86f1c45239325",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -493,8 +371,10 @@
     "delegatecallValueCheck_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -505,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x615b529c200ad6d92f529db125202e703108402aa7fca96899f46462fc0b9500",
-                    "mixHash" : "0xb3432c37d349d8296f2d806915639298c34230acfa786e261e7dfc10179e869b",
-                    "nonce" : "0x7f92c9959c850fe3",
+                    "hash" : "0x13dd0d08d1fa33daa4a0e6154cfaea468b2319e2377f15e2ba29284d1a09e075",
+                    "mixHash" : "0x132f422a649004e6403c30d628abd8a9d10c832619fd09a8056d43ebd3278354",
+                    "nonce" : "0x38c1591b814224be",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0xa9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004",
@@ -516,7 +396,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0b3432c37d349d8296f2d806915639298c34230acfa786e261e7dfc10179e869b887f92c9959c850fe3f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0132f422a649004e6403c30d628abd8a9d10c832619fd09a8056d43ebd32783548838c1591b814224bef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -553,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x615b529c200ad6d92f529db125202e703108402aa7fca96899f46462fc0b9500",
+        "lastblockhash" : "0x13dd0d08d1fa33daa4a0e6154cfaea468b2319e2377f15e2ba29284d1a09e075",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -612,8 +492,10 @@
     "delegatecallValueCheck_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -624,9 +506,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xee90",
-                    "hash" : "0xe7379376737221d69df4291acb2479f40fe2cc8b628e0a4792669c162e20604c",
-                    "mixHash" : "0x30efebac4ca8695c9a8a5ea8101b01d17a222a2c365596e3a0647a7bc5943c84",
-                    "nonce" : "0x5e191a5b2bee95fd",
+                    "hash" : "0x2c56cb1682de868d8784d235ddf31a0dedd859f8aa72f10de4e964c3534f68f4",
+                    "mixHash" : "0x0ac5056a101ab51426355615dfa6f44b5172b8597f49c91950841e534ded7b5e",
+                    "nonce" : "0x29f08f8dc87a4c8d",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0x6fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19a",
@@ -635,7 +517,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a030efebac4ca8695c9a8a5ea8101b01d17a222a2c365596e3a0647a7bc5943c84885e191a5b2bee95fdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a00ac5056a101ab51426355615dfa6f44b5172b8597f49c91950841e534ded7b5e8829f08f8dc87a4c8df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -672,7 +554,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7379376737221d69df4291acb2479f40fe2cc8b628e0a4792669c162e20604c",
+        "lastblockhash" : "0x2c56cb1682de868d8784d235ddf31a0dedd859f8aa72f10de4e964c3534f68f4",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
index e93d7aa9f..49ae07b14 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x76e219239e1ea23fee9da471a7471c7cd6d7ddb4440bf69e696288c108878efd",
-                    "mixHash" : "0x177c53fbe4c0c001675a8f8490b73a4ae7ed01bc2bbcb79a1b33e92016691354",
-                    "nonce" : "0xddcd59286ade3dc9",
+                    "hash" : "0x946f5d14ce38125c632ac62d6924de9be16396de888a61bd44fcc5c0f769d91b",
+                    "mixHash" : "0xf77332bf378748727253e2cf097ac5990d211dee21fe806b33dd122b0cf4b1ef",
+                    "nonce" : "0xb16f61b62b8fb64a",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c72c6904e01f772f1aad7b8a125047c95a4c2eaff4fa4cdabcb8bf8d34172cba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0177c53fbe4c0c001675a8f8490b73a4ae7ed01bc2bbcb79a1b33e9201669135488ddcd59286ade3dc9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c72c6904e01f772f1aad7b8a125047c95a4c2eaff4fa4cdabcb8bf8d34172cba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0f77332bf378748727253e2cf097ac5990d211dee21fe806b33dd122b0cf4b1ef88b16f61b62b8fb64af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76e219239e1ea23fee9da471a7471c7cd6d7ddb4440bf69e696288c108878efd",
+        "lastblockhash" : "0x946f5d14ce38125c632ac62d6924de9be16396de888a61bd44fcc5c0f769d91b",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -113,132 +115,13 @@
             }
         }
     },
-    "delegatecodeDynamicCode2SelfCall_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016e45",
-                    "hash" : "0xd7699e1d9e8400b3456eec53fcef2c32f50ce194be25311bd260d03c82dca8d8",
-                    "mixHash" : "0x38978c4a595b408567ad4ceb4cc20a171c279a72932085a0d667e026ad71966b",
-                    "nonce" : "0x7d2df44a9ceefa79",
-                    "number" : "0x01",
-                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
-                    "stateRoot" : "0x7c1a7c4a64b879d48d3c94f7985d6d774332482a43f0b03f081e381d62d74e20",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c1a7c4a64b879d48d3c94f7985d6d774332482a43f0b03f081e381d62d74e20a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a038978c4a595b408567ad4ceb4cc20a171c279a72932085a0d667e026ad71966b887d2df44a9ceefa79f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "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" : "0xd7699e1d9e8400b3456eec53fcef2c32f50ce194be25311bd260d03c82dca8d8",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8df",
-                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x0b" : "0x01",
-                    "0x0c" : "0x1000000000000000000000000000000000000000"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62d6e45",
-                "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_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -249,9 +132,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x4b82ca08eb40a6fd2bf339c4d7e9cec5aace8aecb89c94587b529c0e358b4258",
-                    "mixHash" : "0x468ff63de9991c03fbbc3b90f78932116742187bf010b6a9d2a62ebee30cd18e",
-                    "nonce" : "0x136695a98cc341b4",
+                    "hash" : "0xcf89a7ec64d39fa371e090cc59f5379750b2fff32d15ea1e1c93bbe63227b7dc",
+                    "mixHash" : "0x3ce9c7f1379df3e77d724f28cdf2eb37de0615a92cc58b116c2d3eadeac720cc",
+                    "nonce" : "0xf35b24d4a3be1daf",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0x6c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304",
@@ -260,7 +143,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0468ff63de9991c03fbbc3b90f78932116742187bf010b6a9d2a62ebee30cd18e88136695a98cc341b4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a03ce9c7f1379df3e77d724f28cdf2eb37de0615a92cc58b116c2d3eadeac720cc88f35b24d4a3be1daff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -297,7 +180,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b82ca08eb40a6fd2bf339c4d7e9cec5aace8aecb89c94587b529c0e358b4258",
+        "lastblockhash" : "0xcf89a7ec64d39fa371e090cc59f5379750b2fff32d15ea1e1c93bbe63227b7dc",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -351,8 +234,10 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -363,9 +248,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x71a9c041d9d765bf1c339a75239f08e3408d283b80aea4458bb4fcd0ebdaf372",
-                    "mixHash" : "0x8a56314f7307ecf59fb1ca540b7a429dfddf6d470f55bb685e6147892ad63029",
-                    "nonce" : "0xe9542b9a65c5e099",
+                    "hash" : "0x79060d7f1f1342e77276d6d45d54309ee7ddfad62e7c1bc518f87ac9f976ca11",
+                    "mixHash" : "0xe4bf23b6eea98c06deb24aaadd32800462c641e609ed03c32c4de81047981de0",
+                    "nonce" : "0xfe7b0377e44f7922",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0x03a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dc",
@@ -374,7 +259,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a08a56314f7307ecf59fb1ca540b7a429dfddf6d470f55bb685e6147892ad6302988e9542b9a65c5e099f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0e4bf23b6eea98c06deb24aaadd32800462c641e609ed03c32c4de81047981de088fe7b0377e44f7922f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -411,7 +296,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71a9c041d9d765bf1c339a75239f08e3408d283b80aea4458bb4fcd0ebdaf372",
+        "lastblockhash" : "0x79060d7f1f1342e77276d6d45d54309ee7ddfad62e7c1bc518f87ac9f976ca11",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -465,8 +350,10 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -477,9 +364,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0x52c1f0868031a6bed0bd60a4da6420d6f69516f7990fdd970a5b7f1d8c0ed9a8",
-                    "mixHash" : "0x5926c2825b8658a5fabb5d270bf1b7e287b46ffdcbb46dca9ec0233eddc27662",
-                    "nonce" : "0x133887eb2e59c64f",
+                    "hash" : "0x2ffe95317a76f16a206f964b1a9ef2971f47df028c1d006bc86ee074111180c2",
+                    "mixHash" : "0xdbb41959253e4947e885a9bfd267a4b6231fee08188eadc4d10951466eefa087",
+                    "nonce" : "0xba48daba28f51acf",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0xef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65",
@@ -488,7 +375,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a05926c2825b8658a5fabb5d270bf1b7e287b46ffdcbb46dca9ec0233eddc2766288133887eb2e59c64ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0dbb41959253e4947e885a9bfd267a4b6231fee08188eadc4d10951466eefa08788ba48daba28f51acff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -525,7 +412,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x52c1f0868031a6bed0bd60a4da6420d6f69516f7990fdd970a5b7f1d8c0ed9a8",
+        "lastblockhash" : "0x2ffe95317a76f16a206f964b1a9ef2971f47df028c1d006bc86ee074111180c2",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -570,8 +457,10 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -582,9 +471,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb1",
-                    "hash" : "0x9b80c038e29e33c3d879b3b34884d86cb06b7dbfff05636c12e3578769caba16",
-                    "mixHash" : "0x2d38ffc4999867b773b5c93efc0d59ea68445d71f2328365f64da5c9b07adb69",
-                    "nonce" : "0x984f21b887e5f904",
+                    "hash" : "0x7920b2101866e704dbfe33cf8d7e34192089361a567e6b05891185f68b1b5e03",
+                    "mixHash" : "0xfe20db8f490fc9200e2d4a0eed269901a1254e5c998566b2c6634c6bf217657f",
+                    "nonce" : "0x37a743dda2666f47",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0xdb63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9",
@@ -593,7 +482,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a02d38ffc4999867b773b5c93efc0d59ea68445d71f2328365f64da5c9b07adb6988984f21b887e5f904f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a0fe20db8f490fc9200e2d4a0eed269901a1254e5c998566b2c6634c6bf217657f8837a743dda2666f47f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,7 +519,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b80c038e29e33c3d879b3b34884d86cb06b7dbfff05636c12e3578769caba16",
+        "lastblockhash" : "0x7920b2101866e704dbfe33cf8d7e34192089361a567e6b05891185f68b1b5e03",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
index 4a5e2600b..8644f93c7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
@@ -2,8 +2,10 @@
     "delegatecodeDynamicCode_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -14,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "0xbc9d2055d24455b711c4f69f7573295ec874933a1e3e5c2885cc6bd73c3e6d90",
-                    "mixHash" : "0x3a1252f0a5972a6f79062a2b5c91d4eaa2ef9e972ad211aa1a3e9ab07ac955b8",
-                    "nonce" : "0xdf2b9f5b89b15f44",
+                    "hash" : "0xff63888acfa85efe7e2802693acb53a2044fcf13691d4e8a71340b0b1bfd5c45",
+                    "mixHash" : "0x427810ae3ea3e6b0a916ff33370f4d204e49c53480996807c29125a48f918b33",
+                    "nonce" : "0x5583edde3a338821",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
@@ -25,7 +27,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000c50710720391826627474d1e006ae2a7731ed5f26f90a5128cd1dd123a139aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a03a1252f0a5972a6f79062a2b5c91d4eaa2ef9e972ad211aa1a3e9ab07ac955b888df2b9f5b89b15f44f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000c50710720391826627474d1e006ae2a7731ed5f26f90a5128cd1dd123a139aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0427810ae3ea3e6b0a916ff33370f4d204e49c53480996807c29125a48f918b33885583edde3a338821f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc9d2055d24455b711c4f69f7573295ec874933a1e3e5c2885cc6bd73c3e6d90",
+        "lastblockhash" : "0xff63888acfa85efe7e2802693acb53a2044fcf13691d4e8a71340b0b1bfd5c45",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -120,139 +122,13 @@
             }
         }
     },
-    "delegatecodeDynamicCode_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01f27b",
-                    "hash" : "0xfab5adfa3ccf3d98445c2f95bc805122982cd4579fab8659225e0757c51450d0",
-                    "mixHash" : "0xebb0b384001c1f06e1961fe2df5ec80d0273eb6d5a3819a578fedc0abcc6e869",
-                    "nonce" : "0xa6633424d3faf767",
-                    "number" : "0x01",
-                    "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
-                    "stateRoot" : "0x1a3333c68f2e8eb33e9729568fc5453c706be4917d9434e8cc79955fa06ff54a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a3333c68f2e8eb33e9729568fc5453c706be4917d9434e8cc79955fa06ff54aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0ebb0b384001c1f06e1961fe2df5ec80d0273eb6d5a3819a578fedc0abcc6e86988a6633424d3faf767f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "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" : "0xfab5adfa3ccf3d98445c2f95bc805122982cd4579fab8659225e0757c51450d0",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x02",
-                "storage" : {
-                    "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
-                    "0x0b" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62df27b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
-                "balance" : "0x01",
-                "code" : "0x600160005533601455",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf0d85",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecodeDynamicCode_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -263,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028ec6",
-                    "hash" : "0xe2d1c4047fa8215938945a36c3ca6297095c54f9bbb1ec59d18fb0eb6f6d8661",
-                    "mixHash" : "0x0f630d16836fa5ac99d6c42ede8a13a4e4e15610e412163ee3733c676b61e24e",
-                    "nonce" : "0xd9621a6c27f3afa7",
+                    "hash" : "0xb6669ee70a8d200c877d0eea55f33e4bf2fa1e36004195ee07bc72072d6cdb1e",
+                    "mixHash" : "0xb489fff7edc99d15f6d4aaa6672c62279e3eaddd6df347ff3662cd33e5734757",
+                    "nonce" : "0x350d29def7bd90b9",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x56414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7f",
@@ -274,7 +150,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a00f630d16836fa5ac99d6c42ede8a13a4e4e15610e412163ee3733c676b61e24e88d9621a6c27f3afa7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a0b489fff7edc99d15f6d4aaa6672c62279e3eaddd6df347ff3662cd33e573475788350d29def7bd90b9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -311,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2d1c4047fa8215938945a36c3ca6297095c54f9bbb1ec59d18fb0eb6f6d8661",
+        "lastblockhash" : "0xb6669ee70a8d200c877d0eea55f33e4bf2fa1e36004195ee07bc72072d6cdb1e",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -374,8 +250,10 @@
     "delegatecodeDynamicCode_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -386,9 +264,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "0xbe7332a8e58c68706fe3e1f97f4b1e8c320797fdb11568d11b2222bb798a20fc",
-                    "mixHash" : "0xdd43d0183d23247ffa684be91c6c7d310dd76e703ff147ee298173f53d9615cf",
-                    "nonce" : "0x435786d123f13035",
+                    "hash" : "0x465a2ed0770c07cdc8bd8de831132858fb0a8831c7b53de09be63dbc6edd56cf",
+                    "mixHash" : "0xd885a8c29285bb330190940889650ab3514695e4193ad9cb49609091265e8c2f",
+                    "nonce" : "0x1cb2dca66f57188f",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x0b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03",
@@ -397,7 +275,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0dd43d0183d23247ffa684be91c6c7d310dd76e703ff147ee298173f53d9615cf88435786d123f13035f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0d885a8c29285bb330190940889650ab3514695e4193ad9cb49609091265e8c2f881cb2dca66f57188ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -434,7 +312,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe7332a8e58c68706fe3e1f97f4b1e8c320797fdb11568d11b2222bb798a20fc",
+        "lastblockhash" : "0x465a2ed0770c07cdc8bd8de831132858fb0a8831c7b53de09be63dbc6edd56cf",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -495,8 +373,10 @@
     "delegatecodeDynamicCode_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -507,9 +387,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0x7189666ffb41ee9eb6ea8d55484a5991a1ffd44aaf0fb9d3bcc0fc547db1cabc",
-                    "mixHash" : "0xcc580d71b8c5b783a5c011173f8939c73c51527a2946b6f5e4e015e6de0eaff6",
-                    "nonce" : "0xc496cd67eafed6e1",
+                    "hash" : "0x3343dbe63b9fda1b64bd444789e1d06593eea08e6b5038f801c6979c411d58fe",
+                    "mixHash" : "0x38bba0c13fb710cad164e27e1d2b057dbacf535306823d8224236c8d38843fd3",
+                    "nonce" : "0x9012283a9cf0458e",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x7e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0",
@@ -518,7 +398,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0cc580d71b8c5b783a5c011173f8939c73c51527a2946b6f5e4e015e6de0eaff688c496cd67eafed6e1f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a038bba0c13fb710cad164e27e1d2b057dbacf535306823d8224236c8d38843fd3889012283a9cf0458ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -555,7 +435,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7189666ffb41ee9eb6ea8d55484a5991a1ffd44aaf0fb9d3bcc0fc547db1cabc",
+        "lastblockhash" : "0x3343dbe63b9fda1b64bd444789e1d06593eea08e6b5038f801c6979c411d58fe",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -600,8 +480,10 @@
     "delegatecodeDynamicCode_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+            "filledwith" : "cpp-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" : [
             {
@@ -612,9 +494,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028c32",
-                    "hash" : "0x6e7dbce62117c5b7bdcd840634c68eb89702d23004dd4825a49510ced0c8f6aa",
-                    "mixHash" : "0x5f91867b3082c2055937b07de20ef39d27dc9f49c2c5f8d0718b68d1c22344a5",
-                    "nonce" : "0x82b058c27e5bd0dc",
+                    "hash" : "0x3ccfacd78651d5f7cb4de76c862b18f0c5808445030210cd5bb8b9a9b3e7963c",
+                    "mixHash" : "0x6c6b882a796335b09c78ef76801fab3e9090a9da0cf254a7028aa58a594bf03e",
+                    "nonce" : "0x4d958e3392b8d8d0",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x0f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139cc",
@@ -623,7 +505,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a05f91867b3082c2055937b07de20ef39d27dc9f49c2c5f8d0718b68d1c22344a58882b058c27e5bd0dcf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a06c6b882a796335b09c78ef76801fab3e9090a9da0cf254a7028aa58a594bf03e884d958e3392b8d8d0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -660,7 +542,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e7dbce62117c5b7bdcd840634c68eb89702d23004dd4825a49510ced0c8f6aa",
+        "lastblockhash" : "0x3ccfacd78651d5f7cb4de76c862b18f0c5808445030210cd5bb8b9a9b3e7963c",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {