update stPreCompiledContracts, stEIP158Specific, stQuadraticComplexity

5 files changed, 88 insertions, 1762 deletions

diff --git a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0.json b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0.json
index d526ac481..405dec04a 100644
--- a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0.json
@@ -2,10 +2,10 @@
     "contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0Filler.json",
-            "sourceHash" : "d5f95fe15f932c1d045b367a772204ed2e9f335db5a97bcd7f4b2fc4cec49abd"
+            "sourceHash" : "23c5b044a11bfe9ea23d4cf9f47e651277c7678b62c7a87af09feac86e891e0d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012411",
-                    "hash" : "0x9028c9ef294f158bad27d071eb13009e5a79aa3caf70b823a6bfc7b0cf3b0c61",
-                    "mixHash" : "0x94ae73acbe39a007d1eab29c4f953422b320722300446f4d03c2769afaeb470e",
-                    "nonce" : "0x4f02fdec757d187f",
+                    "hash" : "0x26c6b8abc8d387d1f26974870f54cab70e8304a8e7ab6c51dd1fad1bb07bd9db",
+                    "mixHash" : "0x4efc213fc81427c886cebd4523924c238bd696f023c841bc4f46c94d104a6475",
+                    "nonce" : "0x3fa9edd58e8a316d",
                     "number" : "0x01",
                     "parentHash" : "0xe5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8",
                     "receiptTrie" : "0xd3e8dadbfb4135b152b7668c12a668eb9404d351609ba709e236bc4b0289dfc7",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0e5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0454ca1f5bdf882cfe570d77233d527cd261894f41aa1751751ee80e21e690c19a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d3e8dadbfb4135b152b7668c12a668eb9404d351609ba709e236bc4b0289dfc7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830124118203e880a094ae73acbe39a007d1eab29c4f953422b320722300446f4d03c2769afaeb470e884f02fdec757d187ff871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ff901f8a0e5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0454ca1f5bdf882cfe570d77233d527cd261894f41aa1751751ee80e21e690c19a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d3e8dadbfb4135b152b7668c12a668eb9404d351609ba709e236bc4b0289dfc7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830124118203e880a04efc213fc81427c886cebd4523924c238bd696f023c841bc4f46c94d104a6475883fa9edd58e8a316df871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ca89fc47fe53d151a3cbbb0e2700c971eb046457d20cffe91c448f0b4d3df5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9028c9ef294f158bad27d071eb13009e5a79aa3caf70b823a6bfc7b0cf3b0c61",
+        "lastblockhash" : "0x26c6b8abc8d387d1f26974870f54cab70e8304a8e7ab6c51dd1fad1bb07bd9db",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -128,400 +128,13 @@
             }
         }
     },
-    "contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0Filler.json",
-            "sourceHash" : "d5f95fe15f932c1d045b367a772204ed2e9f335db5a97bcd7f4b2fc4cec49abd"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x012411",
-                    "hash" : "0x2568c8a29ec0ad66cb80e6c764ff34faa9f8ec885c6b2576158287344e2c9a7d",
-                    "mixHash" : "0x0e1399ee58e4dc446bf6af654765ad3c628b802ea2177bc7fbc439fb00e4de5e",
-                    "nonce" : "0x29c81d98ecbd8456",
-                    "number" : "0x01",
-                    "parentHash" : "0xe5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8",
-                    "receiptTrie" : "0xa63ffb62c2696aaa17532b3586a6566b49593215b7638b0b26584099959c7c18",
-                    "stateRoot" : "0x103b5b674d7a830696bf15e879c9fbe444b430115564e93a0b6a9fff57077a8a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026ff901f8a0e5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0103b5b674d7a830696bf15e879c9fbe444b430115564e93a0b6a9fff57077a8aa0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0a63ffb62c2696aaa17532b3586a6566b49593215b7638b0b26584099959c7c18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830124118203e880a00e1399ee58e4dc446bf6af654765ad3c628b802ea2177bc7fbc439fb00e4de5e8829c81d98ecbd8456f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
-                "transactions" : [
-                    {
-                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                        "gasLimit" : "0x017700",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9e",
-                        "s" : "0x35ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xe5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x26ca89fc47fe53d151a3cbbb0e2700c971eb046457d20cffe91c448f0b4d3df5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ca89fc47fe53d151a3cbbb0e2700c971eb046457d20cffe91c448f0b4d3df5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2568c8a29ec0ad66cb80e6c764ff34faa9f8ec885c6b2576158287344e2c9a7d",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6001600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52411",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fa4cf",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6001600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0Filler.json",
-            "sourceHash" : "d5f95fe15f932c1d045b367a772204ed2e9f335db5a97bcd7f4b2fc4cec49abd"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x012411",
-                    "hash" : "0x981c0d9220bf5be3b33b1982b231004f083b3d5cd79ff77515f7fae1261e188d",
-                    "mixHash" : "0xa0329966971e0132af51ac60ee90c7fd44807a901039cbc8a20228ecae78dd45",
-                    "nonce" : "0xc89bc850680236ea",
-                    "number" : "0x01",
-                    "parentHash" : "0xe5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8",
-                    "receiptTrie" : "0x4e6e9fe6af22e3e907ed4065b100164275937966c9c0fb96c1c45db7121a25e3",
-                    "stateRoot" : "0xb8f5c0cddc6e40944e9af47c34e7eb6d443d42601aa5ab9f92c96dfd7174467e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026ff901f8a0e5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8f5c0cddc6e40944e9af47c34e7eb6d443d42601aa5ab9f92c96dfd7174467ea0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a04e6e9fe6af22e3e907ed4065b100164275937966c9c0fb96c1c45db7121a25e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830124118203e880a0a0329966971e0132af51ac60ee90c7fd44807a901039cbc8a20228ecae78dd4588c89bc850680236eaf871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
-                "transactions" : [
-                    {
-                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                        "gasLimit" : "0x017700",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9e",
-                        "s" : "0x35ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xe5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x26ca89fc47fe53d151a3cbbb0e2700c971eb046457d20cffe91c448f0b4d3df5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ca89fc47fe53d151a3cbbb0e2700c971eb046457d20cffe91c448f0b4d3df5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x981c0d9220bf5be3b33b1982b231004f083b3d5cd79ff77515f7fae1261e188d",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6001600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52411",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fa4cf",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6001600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0Filler.json",
-            "sourceHash" : "d5f95fe15f932c1d045b367a772204ed2e9f335db5a97bcd7f4b2fc4cec49abd"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xa47d",
-                    "hash" : "0x4a029ed09d08407e20050fe4b3dcb7d74aedcc047ffd1f0725635c42ab07015e",
-                    "mixHash" : "0x9c187cbec4da7574a286fe84a73079efcbd299efbd55cadd1b7e45b1a06ce9fd",
-                    "nonce" : "0x34f4f02d3e7586b1",
-                    "number" : "0x01",
-                    "parentHash" : "0xe5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8",
-                    "receiptTrie" : "0x9b272ec522fa063a87654d4e0b48c53dc6fbf4c8d5a6b2c43984f81def85ed37",
-                    "stateRoot" : "0xd1a45c49b6abedf18effe65923902759e52367b5e7dfb08d1ef92c7b6a1dd280",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026ef901f7a0e5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a45c49b6abedf18effe65923902759e52367b5e7dfb08d1ef92c7b6a1dd280a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a09b272ec522fa063a87654d4e0b48c53dc6fbf4c8d5a6b2c43984f81def85ed37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a47d8203e880a09c187cbec4da7574a286fe84a73079efcbd299efbd55cadd1b7e45b1a06ce9fd8834f4f02d3e7586b1f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
-                "transactions" : [
-                    {
-                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                        "gasLimit" : "0x017700",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9e",
-                        "s" : "0x35ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xe5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x26ca89fc47fe53d151a3cbbb0e2700c971eb046457d20cffe91c448f0b4d3df5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ca89fc47fe53d151a3cbbb0e2700c971eb046457d20cffe91c448f0b4d3df5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a029ed09d08407e20050fe4b3dcb7d74aedcc047ffd1f0725635c42ab07015e",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6001600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a47d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x102463",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6001600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction_d0g0v0Filler.json",
-            "sourceHash" : "d5f95fe15f932c1d045b367a772204ed2e9f335db5a97bcd7f4b2fc4cec49abd"
+            "sourceHash" : "23c5b044a11bfe9ea23d4cf9f47e651277c7678b62c7a87af09feac86e891e0d"
         },
         "blocks" : [
             {
@@ -532,9 +145,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x017700",
-                    "hash" : "0xb503eb1e4ad686789e5686cc53a43b4a58132f7aad8a21ee3952ab6fb898bfc6",
-                    "mixHash" : "0x569f370adc0953a202007c1f15ce0ac7e8fe7e146eca01b35a4f6f5697815fd3",
-                    "nonce" : "0x5e31d4348ea49e29",
+                    "hash" : "0x76c6d93c889ba8d89323665c155efc76e95f908746207526f5b7596b4e0d4ce6",
+                    "mixHash" : "0x7601915b401c77673aabde78364285d2f2f1d4a31e3c85123471e57f50976f8d",
+                    "nonce" : "0xccd57ed5ed318e7f",
                     "number" : "0x01",
                     "parentHash" : "0xe5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8",
                     "receiptTrie" : "0x52ebd4980507f15b1e600aafc55aad09e79cf6dc34778fc11cb4a7a6547e61be",
@@ -543,7 +156,7 @@
                     "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0e5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020f67f4727a30a2a08b10addb6b064f4352155d1a33668d3037221e0477c053fa0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a052ebd4980507f15b1e600aafc55aad09e79cf6dc34778fc11cb4a7a6547e61beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830177008203e880a0569f370adc0953a202007c1f15ce0ac7e8fe7e146eca01b35a4f6f5697815fd3885e31d4348ea49e29f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ff901f8a0e5a437534ced7e31e44e28665f1e3cc47c479a7d58c28b2c526d31c7baefa9a8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020f67f4727a30a2a08b10addb6b064f4352155d1a33668d3037221e0477c053fa0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a052ebd4980507f15b1e600aafc55aad09e79cf6dc34778fc11cb4a7a6547e61beb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830177008203e880a07601915b401c77673aabde78364285d2f2f1d4a31e3c85123471e57f50976f8d88ccd57ed5ed318e7ff871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -580,7 +193,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026ca89fc47fe53d151a3cbbb0e2700c971eb046457d20cffe91c448f0b4d3df5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb503eb1e4ad686789e5686cc53a43b4a58132f7aad8a21ee3952ab6fb898bfc6",
+        "lastblockhash" : "0x76c6d93c889ba8d89323665c155efc76e95f908746207526f5b7596b4e0d4ce6",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0.json
index 88f833c57..1fafade3d 100644
--- a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0.json
@@ -2,10 +2,10 @@
     "contractCreationOOGdontLeaveEmptyContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "4e8ccf278c1c92a487a8872b6b7dc32d48c270c56f2b9e56074ee617b8765d0f"
+            "sourceHash" : "2b2e0da5515f357719826bdf17adba803ab142a8622d2a446868fcb9e4193f84"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016a48",
-                    "hash" : "0xae0a2860f0199df2771de72bb13d5f68f5f33680ed5883b70a69089b9568cb68",
-                    "mixHash" : "0xac4d3291cf24bbe3b0002a3aa6f559a4d7efadf0c2277ddc9149d45f694e4a9e",
-                    "nonce" : "0x6fbb81f374f79775",
+                    "hash" : "0xe49f6cac0f8b1d1cb207adbba1bfa23609cdeeb705d007c798e654fb0e7b1548",
+                    "mixHash" : "0x06ef9506b1d8fea3c73828ee2f69a535871bb5f66bd147a8382d94fffce018d1",
+                    "nonce" : "0x54bc0cac656bb7bc",
                     "number" : "0x01",
                     "parentHash" : "0xc197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecde",
                     "receiptTrie" : "0x3668343422de198ffb815b81ab0f6d39d132bc7068af5fee12b292adc49098cd",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecdea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06041faacfe4846f218280bfccb54b5d2a55d12a520e43a1c5237277e99d8d721a05886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790aa03668343422de198ffb815b81ab0f6d39d132bc7068af5fee12b292adc49098cdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016a488203e880a0ac4d3291cf24bbe3b0002a3aa6f559a4d7efadf0c2277ddc9149d45f694e4a9e886fbb81f374f79775f862f860800183016b8094100000000000000000000000000000000000000180801ca048fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8a008f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3c0",
+                "rlp" : "0xf90260f901f8a0c197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecdea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06041faacfe4846f218280bfccb54b5d2a55d12a520e43a1c5237277e99d8d721a05886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790aa03668343422de198ffb815b81ab0f6d39d132bc7068af5fee12b292adc49098cdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016a488203e880a006ef9506b1d8fea3c73828ee2f69a535871bb5f66bd147a8382d94fffce018d18854bc0cac656bb7bcf862f860800183016b8094100000000000000000000000000000000000000180801ca048fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8a008f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x016b80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021e213bbb6a6590941ab30ef7e13e57dcd51e8619ed98ad82cb2aa6996327482a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae0a2860f0199df2771de72bb13d5f68f5f33680ed5883b70a69089b9568cb68",
+        "lastblockhash" : "0xe49f6cac0f8b1d1cb207adbba1bfa23609cdeeb705d007c798e654fb0e7b1548",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -107,337 +107,13 @@
             }
         }
     },
-    "contractCreationOOGdontLeaveEmptyContract_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "4e8ccf278c1c92a487a8872b6b7dc32d48c270c56f2b9e56074ee617b8765d0f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016a48",
-                    "hash" : "0xd7ad5365556c650bdc0078eecb496c932d8b181e9a1e3cdb3a854f3d6cc4424a",
-                    "mixHash" : "0xba6c677a6e00ae06a44847f87ad4c486c5853a9ae1af43c6e6f49edef4ff67e3",
-                    "nonce" : "0x63106ccdbcc7bb72",
-                    "number" : "0x01",
-                    "parentHash" : "0xc197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecde",
-                    "receiptTrie" : "0xed4572e94671ef02cc28c296afb667fbd0caa8f195443db78053d7293f2d815a",
-                    "stateRoot" : "0x6d62c8781dbe8448076e10b6f083cd2b2b418c22639d6831ad776de2e031d110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790a",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0c197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecdea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d62c8781dbe8448076e10b6f083cd2b2b418c22639d6831ad776de2e031d110a05886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790aa0ed4572e94671ef02cc28c296afb667fbd0caa8f195443db78053d7293f2d815ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016a488203e880a0ba6c677a6e00ae06a44847f87ad4c486c5853a9ae1af43c6e6f49edef4ff67e38863106ccdbcc7bb72f862f860800183016b8094100000000000000000000000000000000000000180801ca048fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8a008f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x016b80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x48fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8",
-                        "s" : "0x08f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xc197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecde",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x21e213bbb6a6590941ab30ef7e13e57dcd51e8619ed98ad82cb2aa6996327482",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021e213bbb6a6590941ab30ef7e13e57dcd51e8619ed98ad82cb2aa6996327482a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7ad5365556c650bdc0078eecb496c932d8b181e9a1e3cdb3a854f3d6cc4424a",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60106001557f6001600155601080600c6000396000f3006000355415600957005b6020356000600052602060006000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x01" : "0x10"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56a48",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1c58",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60106001557f6001600155601080600c6000396000f3006000355415600957005b6020356000600052602060006000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "contractCreationOOGdontLeaveEmptyContract_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "4e8ccf278c1c92a487a8872b6b7dc32d48c270c56f2b9e56074ee617b8765d0f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016a48",
-                    "hash" : "0x8acb53ab0d9f78d1cb94a3407952fd509c5ada78311fd7effc06338a4a83145e",
-                    "mixHash" : "0x340764c9f00b899a0345870b0373a8eec269216003a686b42d52c16dea23afe4",
-                    "nonce" : "0xf4dc734751ba6146",
-                    "number" : "0x01",
-                    "parentHash" : "0xc197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecde",
-                    "receiptTrie" : "0xed4572e94671ef02cc28c296afb667fbd0caa8f195443db78053d7293f2d815a",
-                    "stateRoot" : "0x6d62c8781dbe8448076e10b6f083cd2b2b418c22639d6831ad776de2e031d110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790a",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0c197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecdea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d62c8781dbe8448076e10b6f083cd2b2b418c22639d6831ad776de2e031d110a05886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790aa0ed4572e94671ef02cc28c296afb667fbd0caa8f195443db78053d7293f2d815ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016a488203e880a0340764c9f00b899a0345870b0373a8eec269216003a686b42d52c16dea23afe488f4dc734751ba6146f862f860800183016b8094100000000000000000000000000000000000000180801ca048fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8a008f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x016b80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x48fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8",
-                        "s" : "0x08f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xc197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecde",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x21e213bbb6a6590941ab30ef7e13e57dcd51e8619ed98ad82cb2aa6996327482",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021e213bbb6a6590941ab30ef7e13e57dcd51e8619ed98ad82cb2aa6996327482a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8acb53ab0d9f78d1cb94a3407952fd509c5ada78311fd7effc06338a4a83145e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60106001557f6001600155601080600c6000396000f3006000355415600957005b6020356000600052602060006000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x01" : "0x10"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56a48",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1c58",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60106001557f6001600155601080600c6000396000f3006000355415600957005b6020356000600052602060006000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "contractCreationOOGdontLeaveEmptyContract_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "4e8ccf278c1c92a487a8872b6b7dc32d48c270c56f2b9e56074ee617b8765d0f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016b80",
-                    "hash" : "0x0eb7fd5d6a32f3428c7c64563c61b0e1609a1335d32972b4e9994b88849eab4d",
-                    "mixHash" : "0x2999eedc5cb7cb0f2812bd70dcb07aa61ff3f2c2c5640bc9656b23181ee371bc",
-                    "nonce" : "0xa7d26184c0e0d9ce",
-                    "number" : "0x01",
-                    "parentHash" : "0xc197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecde",
-                    "receiptTrie" : "0x8e820dd78fbefd430c1cb18dbf61d0ebe8236278b33ea764deee3734f8d33d8c",
-                    "stateRoot" : "0xf18826e3108e8b891a4eac830fe4b9115cf1b44035c67da8436526feee90f8a0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790a",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0c197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecdea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f18826e3108e8b891a4eac830fe4b9115cf1b44035c67da8436526feee90f8a0a05886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790aa08e820dd78fbefd430c1cb18dbf61d0ebe8236278b33ea764deee3734f8d33d8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016b808203e880a02999eedc5cb7cb0f2812bd70dcb07aa61ff3f2c2c5640bc9656b23181ee371bc88a7d26184c0e0d9cef862f860800183016b8094100000000000000000000000000000000000000180801ca048fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8a008f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x016b80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x48fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8",
-                        "s" : "0x08f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xc197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecde",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x21e213bbb6a6590941ab30ef7e13e57dcd51e8619ed98ad82cb2aa6996327482",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021e213bbb6a6590941ab30ef7e13e57dcd51e8619ed98ad82cb2aa6996327482a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0eb7fd5d6a32f3428c7c64563c61b0e1609a1335d32972b4e9994b88849eab4d",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60106001557f6001600155601080600c6000396000f3006000355415600957005b6020356000600052602060006000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x01" : "0x10"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56b80",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b20",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60106001557f6001600155601080600c6000396000f3006000355415600957005b6020356000600052602060006000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "contractCreationOOGdontLeaveEmptyContract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "4e8ccf278c1c92a487a8872b6b7dc32d48c270c56f2b9e56074ee617b8765d0f"
+            "sourceHash" : "2b2e0da5515f357719826bdf17adba803ab142a8622d2a446868fcb9e4193f84"
         },
         "blocks" : [
             {
@@ -448,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016b80",
-                    "hash" : "0xfc038fccc34b5be0ba0a711fc8114edef37694aff3676338f63fb307b374c424",
-                    "mixHash" : "0xe4da740dacfe97254ee35ba9619d00922dbcd6fc0ef587d723259fa786b9f6d0",
-                    "nonce" : "0x60b63fcfa0709ed2",
+                    "hash" : "0xbc0f673aae04b256ff1fdd19929d422e6fe0fce47cea7d35747e8b6e2a328aaf",
+                    "mixHash" : "0x3f10e6b1f1b9738bcaa20948b4364903535d6ed1a6180167234cbbb02f791008",
+                    "nonce" : "0x9cfd22555ddb9db3",
                     "number" : "0x01",
                     "parentHash" : "0xc197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecde",
                     "receiptTrie" : "0x8e820dd78fbefd430c1cb18dbf61d0ebe8236278b33ea764deee3734f8d33d8c",
@@ -459,10 +135,10 @@
                     "transactionsTrie" : "0x5886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecdea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f18826e3108e8b891a4eac830fe4b9115cf1b44035c67da8436526feee90f8a0a05886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790aa08e820dd78fbefd430c1cb18dbf61d0ebe8236278b33ea764deee3734f8d33d8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016b808203e880a0e4da740dacfe97254ee35ba9619d00922dbcd6fc0ef587d723259fa786b9f6d08860b63fcfa0709ed2f862f860800183016b8094100000000000000000000000000000000000000180801ca048fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8a008f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3c0",
+                "rlp" : "0xf90260f901f8a0c197dd8d242ed404c45ba3296a0a3e60664a00eb52be61c81a750eb1f128ecdea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f18826e3108e8b891a4eac830fe4b9115cf1b44035c67da8436526feee90f8a0a05886f6d8c18d2ab5f33bb64a328d6eb09255443e2775248b610adabff31e790aa08e820dd78fbefd430c1cb18dbf61d0ebe8236278b33ea764deee3734f8d33d8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016b808203e880a03f10e6b1f1b9738bcaa20948b4364903535d6ed1a6180167234cbbb02f791008889cfd22555ddb9db3f862f860800183016b8094100000000000000000000000000000000000000180801ca048fcbe6740dbb3ae8557dd1370ebd60e8fad8925522eeb2689984ef8241ae4d8a008f0cf92d81454dab493ab6b0cb3b69aec915cf8ab06bdeac36f617094f9c8d3c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x016b80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -496,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021e213bbb6a6590941ab30ef7e13e57dcd51e8619ed98ad82cb2aa6996327482a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc038fccc34b5be0ba0a711fc8114edef37694aff3676338f63fb307b374c424",
+        "lastblockhash" : "0xbc0f673aae04b256ff1fdd19929d422e6fe0fce47cea7d35747e8b6e2a328aaf",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0.json
index 09329b14d..bc14a193d 100644
--- a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0.json
@@ -2,10 +2,10 @@
     "createContractViaContractOOGInitCode_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0Filler.json",
-            "sourceHash" : "90df8a6397f6e4f8e1d437383d7d3fb967c8f3c0842b593a3ddf7934e2e54f40"
+            "sourceHash" : "44609f5d63cbcbf9c9726023237531bb913173cfd1cde34183aab5a54466a1bf"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x019728",
-                    "hash" : "0x0645f094c390e622abea83daf37701edfd235148bd68b8e37e38e65b99bf1109",
-                    "mixHash" : "0x2804936e3b8f074da52939a2a306050711afb68781a41bdd81d23c8e4f6037b9",
-                    "nonce" : "0x8c88e920cb200ae4",
+                    "hash" : "0xb891856120c25e77690dd8b660112b85bd85b5122eea7ade7e9302bc5fd04440",
+                    "mixHash" : "0x5e148b123db8bb0691df0e0629dc70d19fcf8388f7c1eba7da34d7b492cc1a92",
+                    "nonce" : "0x9972a90030db30b1",
                     "number" : "0x01",
                     "parentHash" : "0x84858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3df",
                     "receiptTrie" : "0xfded99637e1176544b2a6a1be76fe92d78913b98f8f987b6a5c9f1ebaaafedc2",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x2ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a084858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4c4f1be4161fb22f6201e38888baf7da8cca7746de01eb4cf16025a1d6bffa6a02ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000a0fded99637e1176544b2a6a1be76fe92d78913b98f8f987b6a5c9f1ebaaafedc2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830197288203e880a02804936e3b8f074da52939a2a306050711afb68781a41bdd81d23c8e4f6037b9888c88e920cb200ae4f862f860800183019a5494100000000000000000000000000000000000000180801ba0cd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685a075539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6c0",
+                "rlp" : "0xf90260f901f8a084858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4c4f1be4161fb22f6201e38888baf7da8cca7746de01eb4cf16025a1d6bffa6a02ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000a0fded99637e1176544b2a6a1be76fe92d78913b98f8f987b6a5c9f1ebaaafedc2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830197288203e880a05e148b123db8bb0691df0e0629dc70d19fcf8388f7c1eba7da34d7b492cc1a92889972a90030db30b1f862f860800183019a5494100000000000000000000000000000000000000180801ba0cd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685a075539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067c3d4a79a007dc99753c58af276899cf3ec223a3ee761e439fdacfa2b8a5a0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0645f094c390e622abea83daf37701edfd235148bd68b8e37e38e65b99bf1109",
+        "lastblockhash" : "0xb891856120c25e77690dd8b660112b85bd85b5122eea7ade7e9302bc5fd04440",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -106,334 +106,13 @@
             }
         }
     },
-    "createContractViaContractOOGInitCode_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0Filler.json",
-            "sourceHash" : "90df8a6397f6e4f8e1d437383d7d3fb967c8f3c0842b593a3ddf7934e2e54f40"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x019728",
-                    "hash" : "0x4894e718f547afb14f9bdcc1138a2fc1bbef0e4310a039e4fd3fb331e35ea4d7",
-                    "mixHash" : "0x40a119985cf9f584fcdfbecef6def923dfb2b7bc0b7f537e1cd718ec5ede3db4",
-                    "nonce" : "0xc74e1b92b7f2aa47",
-                    "number" : "0x01",
-                    "parentHash" : "0x84858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3df",
-                    "receiptTrie" : "0x89c91cb9203b8d091c3a63518b82b6cd18d6f329ebd4b13b178217b635aa8673",
-                    "stateRoot" : "0xe48e2813591196b43d564d7eeb63ec90ae1339d83e2ea7b27768d51ca9e59c26",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x2ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a084858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e48e2813591196b43d564d7eeb63ec90ae1339d83e2ea7b27768d51ca9e59c26a02ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000a089c91cb9203b8d091c3a63518b82b6cd18d6f329ebd4b13b178217b635aa8673b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830197288203e880a040a119985cf9f584fcdfbecef6def923dfb2b7bc0b7f537e1cd718ec5ede3db488c74e1b92b7f2aa47f862f860800183019a5494100000000000000000000000000000000000000180801ba0cd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685a075539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x019a54",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xcd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685",
-                        "s" : "0x75539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x84858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3df",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x67c3d4a79a007dc99753c58af276899cf3ec223a3ee761e439fdacfa2b8a5a0f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067c3d4a79a007dc99753c58af276899cf3ec223a3ee761e439fdacfa2b8a5a0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4894e718f547afb14f9bdcc1138a2fc1bbef0e4310a039e4fd3fb331e35ea4d7",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6b602060406000f0600c600055600052600c60146000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f59728",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f31b8",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6b602060406000f0600c600055600052600c60146000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createContractViaContractOOGInitCode_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0Filler.json",
-            "sourceHash" : "90df8a6397f6e4f8e1d437383d7d3fb967c8f3c0842b593a3ddf7934e2e54f40"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x019728",
-                    "hash" : "0x32a127245ff20b384067ff8b1f7057b7f0e4415ff80b3367e626093040ee3940",
-                    "mixHash" : "0xadb30a2bbde450ec68675c0cba510d970ce7125f3e62a03799d7cfe9113d2c52",
-                    "nonce" : "0x45fa839f709938eb",
-                    "number" : "0x01",
-                    "parentHash" : "0x84858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3df",
-                    "receiptTrie" : "0x89c91cb9203b8d091c3a63518b82b6cd18d6f329ebd4b13b178217b635aa8673",
-                    "stateRoot" : "0xe48e2813591196b43d564d7eeb63ec90ae1339d83e2ea7b27768d51ca9e59c26",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x2ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a084858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e48e2813591196b43d564d7eeb63ec90ae1339d83e2ea7b27768d51ca9e59c26a02ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000a089c91cb9203b8d091c3a63518b82b6cd18d6f329ebd4b13b178217b635aa8673b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830197288203e880a0adb30a2bbde450ec68675c0cba510d970ce7125f3e62a03799d7cfe9113d2c528845fa839f709938ebf862f860800183019a5494100000000000000000000000000000000000000180801ba0cd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685a075539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x019a54",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xcd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685",
-                        "s" : "0x75539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x84858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3df",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x67c3d4a79a007dc99753c58af276899cf3ec223a3ee761e439fdacfa2b8a5a0f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067c3d4a79a007dc99753c58af276899cf3ec223a3ee761e439fdacfa2b8a5a0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x32a127245ff20b384067ff8b1f7057b7f0e4415ff80b3367e626093040ee3940",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6b602060406000f0600c600055600052600c60146000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f59728",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f31b8",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6b602060406000f0600c600055600052600c60146000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createContractViaContractOOGInitCode_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0Filler.json",
-            "sourceHash" : "90df8a6397f6e4f8e1d437383d7d3fb967c8f3c0842b593a3ddf7934e2e54f40"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x019a54",
-                    "hash" : "0x45a7882ea2873a90c34eeca253b2cea134c8c782090cc26ffd245dd6c6541a09",
-                    "mixHash" : "0xae96c1986c7da2b2e80eac88163a61228b5b9eaa24f5a5962c3726c7e8faefb3",
-                    "nonce" : "0xdd6f394288b3756b",
-                    "number" : "0x01",
-                    "parentHash" : "0x84858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3df",
-                    "receiptTrie" : "0x692d66896520bc5b07ef022bb68ac28e3af8e6954b112f1793e148f580ca0366",
-                    "stateRoot" : "0x1b8d2c9c3d0f55e4650243ace4c294af7dd0e2dfe7adaf89a9b8688924960317",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x2ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a084858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b8d2c9c3d0f55e4650243ace4c294af7dd0e2dfe7adaf89a9b8688924960317a02ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000a0692d66896520bc5b07ef022bb68ac28e3af8e6954b112f1793e148f580ca0366b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a0ae96c1986c7da2b2e80eac88163a61228b5b9eaa24f5a5962c3726c7e8faefb388dd6f394288b3756bf862f860800183019a5494100000000000000000000000000000000000000180801ba0cd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685a075539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x019a54",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xcd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685",
-                        "s" : "0x75539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x84858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3df",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x67c3d4a79a007dc99753c58af276899cf3ec223a3ee761e439fdacfa2b8a5a0f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067c3d4a79a007dc99753c58af276899cf3ec223a3ee761e439fdacfa2b8a5a0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45a7882ea2873a90c34eeca253b2cea134c8c782090cc26ffd245dd6c6541a09",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6b602060406000f0600c600055600052600c60146000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f59a54",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f2e8c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6b602060406000f0600c600055600052600c60146000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createContractViaContractOOGInitCode_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode_d0g0v0Filler.json",
-            "sourceHash" : "90df8a6397f6e4f8e1d437383d7d3fb967c8f3c0842b593a3ddf7934e2e54f40"
+            "sourceHash" : "44609f5d63cbcbf9c9726023237531bb913173cfd1cde34183aab5a54466a1bf"
         },
         "blocks" : [
             {
@@ -444,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x019a54",
-                    "hash" : "0x6b901a835c9532e5b6d6cc5f197e2c4f512e50ed98529557b0d82888bc3453ed",
-                    "mixHash" : "0x3acad9ca949a5743940f14035b823677300429c6469c78d1a64a6c5e14f2da0f",
-                    "nonce" : "0x91969bd54a7deaa9",
+                    "hash" : "0xbfd631988cddc803d67335dec2d3869ee57af9aea115f19f9e262d6a72369886",
+                    "mixHash" : "0xa06d8e33b9958b30c4e5e5788a6ea037c302ccb24c7038cf86d55a30e6182e71",
+                    "nonce" : "0x88468f84889933d8",
                     "number" : "0x01",
                     "parentHash" : "0x84858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3df",
                     "receiptTrie" : "0x692d66896520bc5b07ef022bb68ac28e3af8e6954b112f1793e148f580ca0366",
@@ -455,10 +134,10 @@
                     "transactionsTrie" : "0x2ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a084858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b8d2c9c3d0f55e4650243ace4c294af7dd0e2dfe7adaf89a9b8688924960317a02ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000a0692d66896520bc5b07ef022bb68ac28e3af8e6954b112f1793e148f580ca0366b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a03acad9ca949a5743940f14035b823677300429c6469c78d1a64a6c5e14f2da0f8891969bd54a7deaa9f862f860800183019a5494100000000000000000000000000000000000000180801ba0cd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685a075539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6c0",
+                "rlp" : "0xf90260f901f8a084858096dacf3f08c193542fdfa8332d9c69edec41cd15ee7b6d2c0ce5bff3dfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b8d2c9c3d0f55e4650243ace4c294af7dd0e2dfe7adaf89a9b8688924960317a02ef413a3884522e5edd82fec3baba532a6e487e70280c171dec16ca031e85000a0692d66896520bc5b07ef022bb68ac28e3af8e6954b112f1793e148f580ca0366b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a0a06d8e33b9958b30c4e5e5788a6ea037c302ccb24c7038cf86d55a30e6182e718888468f84889933d8f862f860800183019a5494100000000000000000000000000000000000000180801ba0cd466f67e97e11063177e79318e9a31fbcfc92fdb0ae08cb3f9d7437b17a7685a075539ac6ee73217d208c523f5cf2500318e2c6caa60e1932dd524945d33287d6c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -492,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067c3d4a79a007dc99753c58af276899cf3ec223a3ee761e439fdacfa2b8a5a0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b901a835c9532e5b6d6cc5f197e2c4f512e50ed98529557b0d82888bc3453ed",
+        "lastblockhash" : "0xbfd631988cddc803d67335dec2d3869ee57af9aea115f19f9e262d6a72369886",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0.json
index 7ebd79dd7..2dbfbb4cd 100644
--- a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0.json
@@ -2,10 +2,10 @@
     "createContractViaContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json",
-            "sourceHash" : "07bfbe029c926d543a600ed3aabc6d92299776ec835eb159945548b608bd8d18"
+            "sourceHash" : "872daa77d1a674d8be68148363a8d9f625e4b7682253b05c8e0d5fa9ea3be8ca"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf11",
-                    "hash" : "0xe8f7a30420cc4e8dd6a00dfdc0a84bcc4d73bf57112d9af930c024fb74e4e98e",
-                    "mixHash" : "0x06d83cd76434f7d4943d71a2c289a5ca249f9d359e7302b642b973ef0df6af4a",
-                    "nonce" : "0x890f8f90dc03c153",
+                    "hash" : "0x2fb34efe459bb87c9468d932b8f157fedee06a38e108fecbf9a2a74716e47db7",
+                    "mixHash" : "0xd89de224a53b7470cf8febc0e0f42bd20ca50637378179dc6cab51262761fb21",
+                    "nonce" : "0x23cd45050f934034",
                     "number" : "0x01",
                     "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
                     "receiptTrie" : "0x74d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0021843091fb4a2ac2f95ac717354315ce1d708f0a768da4b0091f1c96724a6c5a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa074d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a006d83cd76434f7d4943d71a2c289a5ca249f9d359e7302b642b973ef0df6af4a88890f8f90dc03c153f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
+                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0021843091fb4a2ac2f95ac717354315ce1d708f0a768da4b0091f1c96724a6c5a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa074d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a0d89de224a53b7470cf8febc0e0f42bd20ca50637378179dc6cab51262761fb218823cd45050f934034f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0186a0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8f7a30420cc4e8dd6a00dfdc0a84bcc4d73bf57112d9af930c024fb74e4e98e",
+        "lastblockhash" : "0x2fb34efe459bb87c9468d932b8f157fedee06a38e108fecbf9a2a74716e47db7",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -113,355 +113,13 @@
             }
         }
     },
-    "createContractViaContract_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json",
-            "sourceHash" : "07bfbe029c926d543a600ed3aabc6d92299776ec835eb159945548b608bd8d18"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xcf11",
-                    "hash" : "0x4c1cae6d7ba01a6a1398c09fe2a60e1666addb4fb27a0838c6d6f793b21e45e5",
-                    "mixHash" : "0x6fca6aa1b7a7e1d6fba6ad39f39052256aabdc073b82548f53fa6f0c21d4c1f5",
-                    "nonce" : "0x12fc93a7667756d2",
-                    "number" : "0x01",
-                    "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-                    "receiptTrie" : "0xdc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebc",
-                    "stateRoot" : "0x36d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a06fca6aa1b7a7e1d6fba6ad39f39052256aabdc073b82548f53fa6f0c21d4c1f58812fc93a7667756d2f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0186a0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851",
-                        "s" : "0x50ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c1cae6d7ba01a6a1398c09fe2a60e1666addb4fb27a0838c6d6f793b21e45e5",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x600060006000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf11",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xb78f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x600060006000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createContractViaContract_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json",
-            "sourceHash" : "07bfbe029c926d543a600ed3aabc6d92299776ec835eb159945548b608bd8d18"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xcf11",
-                    "hash" : "0x8df21e132fab117ddfe05db590254c01d3920f5bf3d22b23005f626e324da5fe",
-                    "mixHash" : "0xa4d2aa1975c408a8d424b5050680f188b72e64ec8fd4744e14d37f14ea467773",
-                    "nonce" : "0xca93a750150b4a87",
-                    "number" : "0x01",
-                    "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-                    "receiptTrie" : "0x7ef8a7a1669068df2c413812d7a2eba79820b8d6e4b69966048589a76e8765f9",
-                    "stateRoot" : "0x0530b4d4c46c87bbfb8f957528bc87e9aa8c40822bb6e5cd9c34c0c6166c7132",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00530b4d4c46c87bbfb8f957528bc87e9aa8c40822bb6e5cd9c34c0c6166c7132a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa07ef8a7a1669068df2c413812d7a2eba79820b8d6e4b69966048589a76e8765f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a0a4d2aa1975c408a8d424b5050680f188b72e64ec8fd4744e14d37f14ea46777388ca93a750150b4a87f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0186a0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851",
-                        "s" : "0x50ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8df21e132fab117ddfe05db590254c01d3920f5bf3d22b23005f626e324da5fe",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x600060006000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf11",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xb78f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x600060006000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createContractViaContract_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json",
-            "sourceHash" : "07bfbe029c926d543a600ed3aabc6d92299776ec835eb159945548b608bd8d18"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xcf11",
-                    "hash" : "0x7db219160d4cb5325ad2bf31e8e9de9bb821d4026c697f59a7c535039150a2e8",
-                    "mixHash" : "0xf89891d780bb0f36dcdc783cb81071304cbdee9223504de5ae88fb214ab0d4e8",
-                    "nonce" : "0xc1a8ce61525b94c9",
-                    "number" : "0x01",
-                    "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-                    "receiptTrie" : "0xdc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebc",
-                    "stateRoot" : "0x36d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a0f89891d780bb0f36dcdc783cb81071304cbdee9223504de5ae88fb214ab0d4e888c1a8ce61525b94c9f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0186a0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851",
-                        "s" : "0x50ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529",
-                        "to" : "0x1000000000000000000000000000000000000001",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7db219160d4cb5325ad2bf31e8e9de9bb821d4026c697f59a7c535039150a2e8",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x600060006000f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf11",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xb78f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x600060006000f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createContractViaContract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json",
-            "sourceHash" : "07bfbe029c926d543a600ed3aabc6d92299776ec835eb159945548b608bd8d18"
+            "sourceHash" : "872daa77d1a674d8be68148363a8d9f625e4b7682253b05c8e0d5fa9ea3be8ca"
         },
         "blocks" : [
             {
@@ -472,9 +130,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf11",
-                    "hash" : "0xe82dd991b64278dfb025705b24a39f8ad20aba2e21532ad9935148a291bac144",
-                    "mixHash" : "0x9871b4038713d9f7a102009b253262bc19d4c28ec77ba4acfc73cdf278c930f9",
-                    "nonce" : "0x9b88b836be14e612",
+                    "hash" : "0x7cefaac3e816cff76f9cc3ab4c711785fd5825f152ee48dfb09b7af1f5620ec5",
+                    "mixHash" : "0x91227d848d80b2697ab6b319a37ce857d1c1c14abe5e8ec6c2eaf549f0bebcfb",
+                    "nonce" : "0x01ffb0c50e43dbdf",
                     "number" : "0x01",
                     "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
                     "receiptTrie" : "0xdc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebc",
@@ -483,10 +141,10 @@
                     "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a09871b4038713d9f7a102009b253262bc19d4c28ec77ba4acfc73cdf278c930f9889b88b836be14e612f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
+                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a091227d848d80b2697ab6b319a37ce857d1c1c14abe5e8ec6c2eaf549f0bebcfb8801ffb0c50e43dbdff862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0186a0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -520,7 +178,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe82dd991b64278dfb025705b24a39f8ad20aba2e21532ad9935148a291bac144",
+        "lastblockhash" : "0x7cefaac3e816cff76f9cc3ab4c711785fd5825f152ee48dfb09b7af1f5620ec5",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0.json b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0.json
index 439edbc57..54a1198af 100644
--- a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0.json
@@ -2,10 +2,10 @@
     "createContractViaTransactionCost53000_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0Filler.json",
-            "sourceHash" : "03c698ceffbe9e09102a20b82793341774b1ad3dc8d860106210bad6a22b2b69"
+            "sourceHash" : "c203039df61000f58231e804d15f9b1f0a7868333f6a3fbadc9f4d8fe3a18e76"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf08",
-                    "hash" : "0xb9084fbf2c8a808cdaa6b9d30088f0c866e714493925b9cf5b4d89524e971ed6",
-                    "mixHash" : "0x2c20a3a72431c71caae05d47b586f6343e9e1348f56bf6b2889293ae52e1f608",
-                    "nonce" : "0xc6946058afe1b55c",
+                    "hash" : "0x8de2fc6c235045bfd4723dc7b26fdd2a2ffa52025c4f6db7a0608b503efb9ee4",
+                    "mixHash" : "0x9d1759329758396a6907f01895cc58426c1d27d2394f693f66807f22bc1d3ada",
+                    "nonce" : "0x1fa5946ee2a8804a",
                     "number" : "0x01",
                     "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
                     "receiptTrie" : "0x65c4d1b533902562730f0d110bcce51643ce4725ca03d85c33d5812c0ed308bf",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9024bf901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0720df746c38342c9f756c4b805af9e72447fc0df5d0f170f32c4e41e47a4d46fa0ea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858a065c4d1b533902562730f0d110bcce51643ce4725ca03d85c33d5812c0ed308bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf088203e880a02c20a3a72431c71caae05d47b586f6343e9e1348f56bf6b2889293ae52e1f60888c6946058afe1b55cf84ef84c8001830186a08080801ba0a579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9a032ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3fc0",
+                "rlp" : "0xf9024bf901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0720df746c38342c9f756c4b805af9e72447fc0df5d0f170f32c4e41e47a4d46fa0ea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858a065c4d1b533902562730f0d110bcce51643ce4725ca03d85c33d5812c0ed308bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf088203e880a09d1759329758396a6907f01895cc58426c1d27d2394f693f66807f22bc1d3ada881fa5946ee2a8804af84ef84c8001830186a08080801ba0a579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9a032ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3fc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0186a0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9084fbf2c8a808cdaa6b9d30088f0c866e714493925b9cf5b4d89524e971ed6",
+        "lastblockhash" : "0x8de2fc6c235045bfd4723dc7b26fdd2a2ffa52025c4f6db7a0608b503efb9ee4",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -99,313 +99,13 @@
             }
         }
     },
-    "createContractViaTransactionCost53000_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0Filler.json",
-            "sourceHash" : "03c698ceffbe9e09102a20b82793341774b1ad3dc8d860106210bad6a22b2b69"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xcf08",
-                    "hash" : "0xdc4b284045f3cfd8851c10f9f8c8d81a654c7841f7e653592fa7d4ad413d38b4",
-                    "mixHash" : "0x356fb909fed793c348caa854d6629af16eaface52ddf18c7e9f1701e4933fdac",
-                    "nonce" : "0xf94202c04bb002ae",
-                    "number" : "0x01",
-                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "0xd11e275fbdc99a06922953905445bde6c2dd3431d02d21b1aaab0a332953484a",
-                    "stateRoot" : "0xc7d01467d5efabfd948abc8b232d7bd8f86e91d277c4e2f77872489948e3b55c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9024bf901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d01467d5efabfd948abc8b232d7bd8f86e91d277c4e2f77872489948e3b55ca0ea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858a0d11e275fbdc99a06922953905445bde6c2dd3431d02d21b1aaab0a332953484ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf088203e880a0356fb909fed793c348caa854d6629af16eaface52ddf18c7e9f1701e4933fdac88f94202c04bb002aef84ef84c8001830186a08080801ba0a579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9a032ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3fc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0186a0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xa579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9",
-                        "s" : "0x32ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3f",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc4b284045f3cfd8851c10f9f8c8d81a654c7841f7e653592fa7d4ad413d38b4",
-        "network" : "EIP150",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf08",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xb798",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createContractViaTransactionCost53000_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0Filler.json",
-            "sourceHash" : "03c698ceffbe9e09102a20b82793341774b1ad3dc8d860106210bad6a22b2b69"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xcf08",
-                    "hash" : "0xca956c736042dda20361942dbf75ca6b031096b9da3c2af7b0d5e33f5cf9c8f7",
-                    "mixHash" : "0xd89d345efdae71e032a4f5c517643ec5b090bf09f80ff1c7e7fb557f0f031d13",
-                    "nonce" : "0x9e4bf87617f6ec58",
-                    "number" : "0x01",
-                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "0xb429c3551132cbac07f2672b45e940eac28afbe13652eada0a8d07644f51d959",
-                    "stateRoot" : "0xa951fc830a4f6288a59baab59fab9450e5e4587b023d280655dbb2e90aee1580",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9024bf901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a951fc830a4f6288a59baab59fab9450e5e4587b023d280655dbb2e90aee1580a0ea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858a0b429c3551132cbac07f2672b45e940eac28afbe13652eada0a8d07644f51d959b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf088203e880a0d89d345efdae71e032a4f5c517643ec5b090bf09f80ff1c7e7fb557f0f031d13889e4bf87617f6ec58f84ef84c8001830186a08080801ba0a579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9a032ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3fc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0186a0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xa579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9",
-                        "s" : "0x32ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3f",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca956c736042dda20361942dbf75ca6b031096b9da3c2af7b0d5e33f5cf9c8f7",
-        "network" : "EIP158",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf08",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xb798",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createContractViaTransactionCost53000_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0Filler.json",
-            "sourceHash" : "03c698ceffbe9e09102a20b82793341774b1ad3dc8d860106210bad6a22b2b69"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x5208",
-                    "hash" : "0xc51824e4e27e06f6c7c4fe7c5f7e51fe30afabdb35668002dc461defab8a7140",
-                    "mixHash" : "0xbc9d7a8e373f0393b0d0156c972f523374e71ff551fc1ea7270de8eb669f6d67",
-                    "nonce" : "0x27e0bad09fe30eed",
-                    "number" : "0x01",
-                    "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-                    "receiptTrie" : "0x3950b954dacac4a9f4e3e8b42400b12270697820e6d3dceb6ca6dfb175584426",
-                    "stateRoot" : "0xf38f77109823647e4b92d109f9585fcafba50fec066fea93cb73ed9593b1e470",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9024bf901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f38f77109823647e4b92d109f9585fcafba50fec066fea93cb73ed9593b1e470a0ea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858a03950b954dacac4a9f4e3e8b42400b12270697820e6d3dceb6ca6dfb175584426b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408252088203e880a0bc9d7a8e373f0393b0d0156c972f523374e71ff551fc1ea7270de8eb669f6d678827e0bad09fe30eedf84ef84c8001830186a08080801ba0a579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9a032ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3fc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0186a0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xa579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9",
-                        "s" : "0x32ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3f",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc51824e4e27e06f6c7c4fe7c5f7e51fe30afabdb35668002dc461defab8a7140",
-        "network" : "Frontier",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45208",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x013498",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createContractViaTransactionCost53000_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000_d0g0v0Filler.json",
-            "sourceHash" : "03c698ceffbe9e09102a20b82793341774b1ad3dc8d860106210bad6a22b2b69"
+            "sourceHash" : "c203039df61000f58231e804d15f9b1f0a7868333f6a3fbadc9f4d8fe3a18e76"
         },
         "blocks" : [
             {
@@ -416,9 +116,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf08",
-                    "hash" : "0xd52eaa18dcf0a11ea47357efed5536f6df4d1c2bccd2e32bbcbc766e801a3558",
-                    "mixHash" : "0x16a2931cfdcc929eba56d9c4459a9d1b91e83ad498af5253894a1ab34c6534d7",
-                    "nonce" : "0x033bdfa3a539ebab",
+                    "hash" : "0x2b292cfe43eee8ce875b8a5b9150d0e31017a0fb67c7d215333021f39eff5dbd",
+                    "mixHash" : "0xc9e19764d8846b147a1bccde7996a13a238113b0ef240efb440c81804a9abad4",
+                    "nonce" : "0xba696048ea9e75d0",
                     "number" : "0x01",
                     "parentHash" : "0xa35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546",
                     "receiptTrie" : "0xd11e275fbdc99a06922953905445bde6c2dd3431d02d21b1aaab0a332953484a",
@@ -427,10 +127,10 @@
                     "transactionsTrie" : "0xea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9024bf901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d01467d5efabfd948abc8b232d7bd8f86e91d277c4e2f77872489948e3b55ca0ea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858a0d11e275fbdc99a06922953905445bde6c2dd3431d02d21b1aaab0a332953484ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf088203e880a016a2931cfdcc929eba56d9c4459a9d1b91e83ad498af5253894a1ab34c6534d788033bdfa3a539ebabf84ef84c8001830186a08080801ba0a579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9a032ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3fc0",
+                "rlp" : "0xf9024bf901f7a0a35295e248019d92600a60b59a979ce901ef66ecce774eb31fa3455fade18546a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d01467d5efabfd948abc8b232d7bd8f86e91d277c4e2f77872489948e3b55ca0ea385872fc210450c7066faa9f7edc33af45f7396a55fa764969d38efde1b858a0d11e275fbdc99a06922953905445bde6c2dd3431d02d21b1aaab0a332953484ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf088203e880a0c9e19764d8846b147a1bccde7996a13a238113b0ef240efb440c81804a9abad488ba696048ea9e75d0f84ef84c8001830186a08080801ba0a579f7ba701a6fad7b1e069bc02c969f2dac68d25e71065a04e66effde9280e9a032ba78b9c364d8a20b92e823f4742dda4e485ceef1c532b0157079f6e64e2a3fc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0186a0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -464,7 +164,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e1c133a5a51b03399ed9ad0380f3182e9e18322f232b816dd4b9094f871e1ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd52eaa18dcf0a11ea47357efed5536f6df4d1c2bccd2e32bbcbc766e801a3558",
+        "lastblockhash" : "0x2b292cfe43eee8ce875b8a5b9150d0e31017a0fb67c7d215333021f39eff5dbd",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {