refill blockchain stCallCreateCallCode

80 files changed, 2068 insertions, 14565 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0.json
index 4dc91b404..b39e90a22 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "2a5a02738ad609e328ac15eb0f50be1e38605d44cff46afb0825903f2702d752"
+            "sourceHash" : "c57b51aa25d7e35e86ac8234289d1b2d261b726a4393692f4a09cf9f62e4aa18"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "0x52ccc9ddad3a1091db60bb08f8056458628d42e7d4a423fbee91db6ea1d3002c",
-                    "mixHash" : "0x0b342afbd9fb0fde942c34e01e6c2412822a16ed97967ebd19c8aedc61c1ee83",
-                    "nonce" : "0x21405f00a1c3ffda",
+                    "hash" : "0x0dab343689e8e9d88f5fa80a4487febbb3632725290a14e60602037a56b97896",
+                    "mixHash" : "0xb481d1e1120d9a2ca939a032e1bcee73fdd80f38e49d83de15d5ae678eee90e9",
+                    "nonce" : "0x22de3fb38934b1b8",
                     "number" : "0x01",
                     "parentHash" : "0xd7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5",
                     "receiptTrie" : "0x3916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548b",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fea0d7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba061ea6d93163808d3155178f624f9a994337304314c2d7fa188e7476d5559dbf1a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a00b342afbd9fb0fde942c34e01e6c2412822a16ed97967ebd19c8aedc61c1ee838821405f00a1c3ffdaf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90269f901fea0d7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba061ea6d93163808d3155178f624f9a994337304314c2d7fa188e7476d5559dbf1a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a0b481d1e1120d9a2ca939a032e1bcee73fdd80f38e49d83de15d5ae678eee90e98822de3fb38934b1b8f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x52ccc9ddad3a1091db60bb08f8056458628d42e7d4a423fbee91db6ea1d3002c",
+        "lastblockhash" : "0x0dab343689e8e9d88f5fa80a4487febbb3632725290a14e60602037a56b97896",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -122,259 +122,13 @@
             }
         }
     },
-    "Call1024BalanceTooLow_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "2a5a02738ad609e328ac15eb0f50be1e38605d44cff46afb0825903f2702d752"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x0117bce4",
-                    "hash" : "0xe8742f98932e3fc44f2dc7d3f864cddd917f6445bc1da422e9780127a9d5ec56",
-                    "mixHash" : "0x9ceeae60e32f33485aeccb499768fdf078659fdd73b51845410a2861d2a50299",
-                    "nonce" : "0xe98a5456c058fb1c",
-                    "number" : "0x01",
-                    "parentHash" : "0xd7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5",
-                    "receiptTrie" : "0x6ad4e61bba0d580aacb5a0e08001663b3b4c88c6b1b9e3c91fe384ebd8aac606",
-                    "stateRoot" : "0xe0cde388748f74c7ed8274bf57ba10c430613a190484b5ae1909afb9e441e4f3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90269f901fea0d7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e0cde388748f74c7ed8274bf57ba10c430613a190484b5ae1909afb9e441e4f3a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06ad4e61bba0d580aacb5a0e08001663b3b4c88c6b1b9e3c91fe384ebd8aac606b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a09ceeae60e32f33485aeccb499768fdf078659fdd73b51845410a2861d2a5029988e98a5456c058fb1cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x10000000d788",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
-                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xd7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8742f98932e3fc44f2dc7d3f864cddd917f6445bc1da422e9780127a9d5ec56",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffee84311",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182460bbce4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024BalanceTooLow_d0g0v0_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/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "2a5a02738ad609e328ac15eb0f50be1e38605d44cff46afb0825903f2702d752"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x0117bce4",
-                    "hash" : "0x982375ab27732654a411ab97cfbe7d3d391f5966f602cfa73537502c975f578d",
-                    "mixHash" : "0x8e2f41eb37ded49774d674613ee13b51932264822162b8bfec685a20c7cac525",
-                    "nonce" : "0x1062560e9b80b722",
-                    "number" : "0x01",
-                    "parentHash" : "0xd7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5",
-                    "receiptTrie" : "0x6ad4e61bba0d580aacb5a0e08001663b3b4c88c6b1b9e3c91fe384ebd8aac606",
-                    "stateRoot" : "0xe0cde388748f74c7ed8274bf57ba10c430613a190484b5ae1909afb9e441e4f3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90269f901fea0d7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e0cde388748f74c7ed8274bf57ba10c430613a190484b5ae1909afb9e441e4f3a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06ad4e61bba0d580aacb5a0e08001663b3b4c88c6b1b9e3c91fe384ebd8aac606b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a08e2f41eb37ded49774d674613ee13b51932264822162b8bfec685a20c7cac525881062560e9b80b722f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x10000000d788",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
-                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xd7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x982375ab27732654a411ab97cfbe7d3d391f5966f602cfa73537502c975f578d",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffee84311",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182460bbce4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Call1024BalanceTooLow_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "2a5a02738ad609e328ac15eb0f50be1e38605d44cff46afb0825903f2702d752"
+            "sourceHash" : "c57b51aa25d7e35e86ac8234289d1b2d261b726a4393692f4a09cf9f62e4aa18"
         },
         "blocks" : [
             {
@@ -385,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d787",
-                    "hash" : "0x8833501469d0b82ce19b5ded56f6a44dba8a9d4fab5ddde4dd99ec948628f28a",
-                    "mixHash" : "0x67dacb2deba4bc60209be59c923d3a5312d8da75de5f463981de842ebf63be3e",
-                    "nonce" : "0x85e22d32015261af",
+                    "hash" : "0xa4e8b87ed1a1cd5227fd715d6ae90ce6c0619f12df105c509368df67a57499d0",
+                    "mixHash" : "0x3f80d9bccd0c5d69f51a205831c59a231cdf50e852fe2ae6cbdfd23a8670761f",
+                    "nonce" : "0xdde09b8060f21bc3",
                     "number" : "0x01",
                     "parentHash" : "0xd7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5",
                     "receiptTrie" : "0x0692cef246e0534474b22ac923658311d2af0841bd0492fe7af14da9ae06f3ea",
@@ -396,10 +150,10 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a0d7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ee021126ce1386bb9f8fd165c7a56413157021e51e5621504090215ace3bdab4a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a00692cef246e0534474b22ac923658311d2af0841bd0492fe7af14da9ae06f3eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a067dacb2deba4bc60209be59c923d3a5312d8da75de5f463981de842ebf63be3e8885e22d32015261aff865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a0d7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ee021126ce1386bb9f8fd165c7a56413157021e51e5621504090215ace3bdab4a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a00692cef246e0534474b22ac923658311d2af0841bd0492fe7af14da9ae06f3eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a03f80d9bccd0c5d69f51a205831c59a231cdf50e852fe2ae6cbdfd23a8670761f88dde09b8060f21bc3f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -433,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8833501469d0b82ce19b5ded56f6a44dba8a9d4fab5ddde4dd99ec948628f28a",
+        "lastblockhash" : "0xa4e8b87ed1a1cd5227fd715d6ae90ce6c0619f12df105c509368df67a57499d0",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -489,127 +243,5 @@
                 }
             }
         }
-    },
-    "Call1024BalanceTooLow_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "2a5a02738ad609e328ac15eb0f50be1e38605d44cff46afb0825903f2702d752"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x10000000d787",
-                    "hash" : "0x5e15329a408de2ec8ecba9bc146a2977fe136231b41cb27dc0089e3a9cf097eb",
-                    "mixHash" : "0xcb8bb327cb6e3e822565f069c910eade658862ff508d6f622fb37dcb1ec88f3c",
-                    "nonce" : "0xe633e00b6f2d7b96",
-                    "number" : "0x01",
-                    "parentHash" : "0xd7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5",
-                    "receiptTrie" : "0x0692cef246e0534474b22ac923658311d2af0841bd0492fe7af14da9ae06f3ea",
-                    "stateRoot" : "0xee021126ce1386bb9f8fd165c7a56413157021e51e5621504090215ace3bdab4",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf90200a0d7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ee021126ce1386bb9f8fd165c7a56413157021e51e5621504090215ace3bdab4a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a00692cef246e0534474b22ac923658311d2af0841bd0492fe7af14da9ae06f3eab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0cb8bb327cb6e3e822565f069c910eade658862ff508d6f622fb37dcb1ec88f3c88e633e00b6f2d7b96f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x10000000d788",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
-                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xd7e843f22887579d0c6817b0c898f48f5a2200cc401d7629a6b64f08b2697fa5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e15329a408de2ec8ecba9bc146a2977fe136231b41cb27dc0089e3a9cf097eb",
-        "network" : "Homestead",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffefffffff286e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563a18244f4d787",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0.json
index 540695b26..4aee01824 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "Call1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "97e1b4c4cc856fb423845baa9ca54d66e3428bd98d955170c9ce016e79a82687"
+            "sourceHash" : "0a8e8a5d55f904585fef800828d5d2095e2830fbe64e0b39f8d72abb51250b8a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8804",
-                    "hash" : "0xedc1a1fcabad7bb8fd493225e99c72db46de4aa84df0f0d3b26ce17f64ea1fd5",
-                    "mixHash" : "0x802ff774e292c4bb6fd490fb54c554581de394db8f54839f67bb17a7cb09096d",
-                    "nonce" : "0x70aff72ecd6244af",
+                    "hash" : "0x12c040ae65529327072b3df72a4fd4672f6bcdd60189fc2a85b924fad5c734cf",
+                    "mixHash" : "0x7448d4e11f8d2446d64a4a49fb83ae0c7b297f01a44dc46fd89ca74f4726c53f",
+                    "nonce" : "0x1fbb7bb71d92c080",
                     "number" : "0x01",
                     "parentHash" : "0x9d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499f",
                     "receiptTrie" : "0x1917d25d782b054277e41445ea09173abe2af947a2729c58d812fc71083cd58a",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda09d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a90ae1e61e35b09e41f521025944f4d17414c74d0b5edc719bfd1b1da813f5d7a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01917d25d782b054277e41445ea09173abe2af947a2729c58d812fc71083cd58ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a88048203e880a0802ff774e292c4bb6fd490fb54c554581de394db8f54839f67bb17a7cb09096d8870aff72ecd6244aff862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda09d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a90ae1e61e35b09e41f521025944f4d17414c74d0b5edc719bfd1b1da813f5d7a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01917d25d782b054277e41445ea09173abe2af947a2729c58d812fc71083cd58ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a88048203e880a07448d4e11f8d2446d64a4a49fb83ae0c7b297f01a44dc46fd89ca74f4726c53f881fbb7bb71d92c080f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba013106aaa8141933adbd035e8639c1fa39b3ec14178b511de42bbc3eaddbb4ccaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedc1a1fcabad7bb8fd493225e99c72db46de4aa84df0f0d3b26ce17f64ea1fd5",
+        "lastblockhash" : "0x12c040ae65529327072b3df72a4fd4672f6bcdd60189fc2a85b924fad5c734cf",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -123,261 +123,13 @@
             }
         }
     },
-    "Call1024OOG_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "97e1b4c4cc856fb423845baa9ca54d66e3428bd98d955170c9ce016e79a82687"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8804",
-                    "hash" : "0xc41cdc141c3a1add2d7169dd72b6a09b82fd917509d66a4adecc62c7c5aba13d",
-                    "mixHash" : "0x10213e0c8633752ae9cbb95a8800da976ab1f4bd91e69142fb989f1731631b45",
-                    "nonce" : "0x7c85a79febe8d7c3",
-                    "number" : "0x01",
-                    "parentHash" : "0x9d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499f",
-                    "receiptTrie" : "0x8b0b38a51bd38fbc07770b15c660a8a0d34462ba80e8bdefa6459220f657fc56",
-                    "stateRoot" : "0x1e8f19b2277825877c293c1909c165ff50bdb046227acd1f3a862b61c982c6aa",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda09d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba01e8f19b2277825877c293c1909c165ff50bdb046227acd1f3a862b61c982c6aaa005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca08b0b38a51bd38fbc07770b15c660a8a0d34462ba80e8bdefa6459220f657fc56b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a88048203e880a010213e0c8633752ae9cbb95a8800da976ab1f4bd91e69142fb989f1731631b45887c85a79febe8d7c3f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x9d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x13106aaa8141933adbd035e8639c1fa39b3ec14178b511de42bbc3eaddbb4cca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba013106aaa8141933adbd035e8639c1fa39b3ec14178b511de42bbc3eaddbb4ccaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc41cdc141c3a1add2d7169dd72b6a09b82fd917509d66a4adecc62c7c5aba13d",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc577f1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8804",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x85",
-                    "0x01" : "0x01",
-                    "0x02" : "0x020789"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024OOG_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "97e1b4c4cc856fb423845baa9ca54d66e3428bd98d955170c9ce016e79a82687"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8804",
-                    "hash" : "0xf8d5a9dd8b2d90001bd6ae3dd225b64cdb5dcf4fc4a1764cd464d63204a3a9fb",
-                    "mixHash" : "0x97ccd0ac9f8ea8933769e122bfeaac7ff570cdbaed0a592b3a4011dfc5a38741",
-                    "nonce" : "0xcef0b0b9e17c8d27",
-                    "number" : "0x01",
-                    "parentHash" : "0x9d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499f",
-                    "receiptTrie" : "0x8b0b38a51bd38fbc07770b15c660a8a0d34462ba80e8bdefa6459220f657fc56",
-                    "stateRoot" : "0x1e8f19b2277825877c293c1909c165ff50bdb046227acd1f3a862b61c982c6aa",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda09d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba01e8f19b2277825877c293c1909c165ff50bdb046227acd1f3a862b61c982c6aaa005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca08b0b38a51bd38fbc07770b15c660a8a0d34462ba80e8bdefa6459220f657fc56b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a88048203e880a097ccd0ac9f8ea8933769e122bfeaac7ff570cdbaed0a592b3a4011dfc5a3874188cef0b0b9e17c8d27f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x9d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x13106aaa8141933adbd035e8639c1fa39b3ec14178b511de42bbc3eaddbb4cca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba013106aaa8141933adbd035e8639c1fa39b3ec14178b511de42bbc3eaddbb4ccaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8d5a9dd8b2d90001bd6ae3dd225b64cdb5dcf4fc4a1764cd464d63204a3a9fb",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc577f1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8804",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x85",
-                    "0x01" : "0x01",
-                    "0x02" : "0x020789"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Call1024OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "97e1b4c4cc856fb423845baa9ca54d66e3428bd98d955170c9ce016e79a82687"
+            "sourceHash" : "0a8e8a5d55f904585fef800828d5d2095e2830fbe64e0b39f8d72abb51250b8a"
         },
         "blocks" : [
             {
@@ -388,9 +140,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefe179",
-                    "hash" : "0xbf4b2957017f0bb8dd94fe325f2769741906067d64011e41b5812a47fc8c934c",
-                    "mixHash" : "0x3f9a1c3ce59d87af60139a11ef5095bed425606caf820d532d9405d7733136d7",
-                    "nonce" : "0x2774452dbd0b1553",
+                    "hash" : "0xff0387212e610fb44029cb8c0c254549b5f60a387b5b4badd6cc5f036177623d",
+                    "mixHash" : "0x69fadfeeb4af2c1eb93ba7f2048e8019bc3488dcfbd704d3e9e2a6c1f87780bb",
+                    "nonce" : "0x3191d82a41ee9148",
                     "number" : "0x01",
                     "parentHash" : "0x9d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499f",
                     "receiptTrie" : "0x5c29a2de87e3595e324042ca35e8c0177f36abeccd813623e9217987f77cf290",
@@ -399,10 +151,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda09d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00085eea7088e6674e5a41977863e90beecf628ac24f9123358111b52a87c335aa005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca05c29a2de87e3595e324042ca35e8c0177f36abeccd813623e9217987f77cf290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe1798203e880a03f9a1c3ce59d87af60139a11ef5095bed425606caf820d532d9405d7733136d7882774452dbd0b1553f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda09d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00085eea7088e6674e5a41977863e90beecf628ac24f9123358111b52a87c335aa005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca05c29a2de87e3595e324042ca35e8c0177f36abeccd813623e9217987f77cf290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe1798203e880a069fadfeeb4af2c1eb93ba7f2048e8019bc3488dcfbd704d3e9e2a6c1f87780bb883191d82a41ee9148f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -436,7 +188,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba013106aaa8141933adbd035e8639c1fa39b3ec14178b511de42bbc3eaddbb4ccaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf4b2957017f0bb8dd94fe325f2769741906067d64011e41b5812a47fc8c934c",
+        "lastblockhash" : "0xff0387212e610fb44029cb8c0c254549b5f60a387b5b4badd6cc5f036177623d",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -494,129 +246,5 @@
                 }
             }
         }
-    },
-    "Call1024OOG_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "97e1b4c4cc856fb423845baa9ca54d66e3428bd98d955170c9ce016e79a82687"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xefe179",
-                    "hash" : "0xd8759e94b7b464a31010aed2fc3904108111c8cf6fb112662fa31d1eeac62ec4",
-                    "mixHash" : "0xa9907d36d2725782218a72cc0fbed63b8837540c454f36beb057286b88058a8e",
-                    "nonce" : "0xb3ee37cc30dd3c20",
-                    "number" : "0x01",
-                    "parentHash" : "0x9d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499f",
-                    "receiptTrie" : "0x5c29a2de87e3595e324042ca35e8c0177f36abeccd813623e9217987f77cf290",
-                    "stateRoot" : "0x0085eea7088e6674e5a41977863e90beecf628ac24f9123358111b52a87c335a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda09d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00085eea7088e6674e5a41977863e90beecf628ac24f9123358111b52a87c335aa005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca05c29a2de87e3595e324042ca35e8c0177f36abeccd813623e9217987f77cf290b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe1798203e880a0a9907d36d2725782218a72cc0fbed63b8837540c454f36beb057286b88058a8e88b3ee37cc30dd3c20f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x9d71b86f5dbaaf561fd6844e73a25652ef34b73c4c67c322737c4d0bec1c499f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x13106aaa8141933adbd035e8639c1fa39b3ec14178b511de42bbc3eaddbb4cca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba013106aaa8141933adbd035e8639c1fa39b3ec14178b511de42bbc3eaddbb4ccaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8759e94b7b464a31010aed2fc3904108111c8cf6fb112662fa31d1eeac62ec4",
-        "network" : "Homestead",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff101e7c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918245e3e179",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01",
-                    "0x02" : "0x0fa3e9"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0.json
index facbd27a7..07cc7c279 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "172420b157fd5d569b28af9769feffba947a2a5b2a2b6b0d700b5ecdc18dd4e1"
+            "sourceHash" : "0411298763213d9e793ebde256cbcb75ac654f7bf3b53b988bbcd3f6eab29be0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d84a6",
-                    "hash" : "0x86f1402353fc2111b88f5b874a3319255dc728afe813eb13cffc2bb6e8052437",
-                    "mixHash" : "0x1b5d55ec9b633fb392fe4a2d6287fc687abdf5992da34173ad668d32107269ed",
-                    "nonce" : "0x05af6f24309ddd4a",
+                    "hash" : "0xef69bb3846cb7eb9784ef08411dabf4b364866b88b5c223c845f8690fcdf7dd6",
+                    "mixHash" : "0x8b8e793b91ce86c904320928b66ad360aa2b1699f1f21081428cb2a3116f0476",
+                    "nonce" : "0x160073661a8aa68c",
                     "number" : "0x01",
                     "parentHash" : "0x788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21",
                     "receiptTrie" : "0x47e523f247c7f04664ca01c908f7ffb27e27a8e456da67781db73f57db2d9e3a",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba073c201cf574fc6069252fb4e3b4da04fdc0b7e249e10598837dddf218f77b83ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa047e523f247c7f04664ca01c908f7ffb27e27a8e456da67781db73f57db2d9e3ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a01b5d55ec9b633fb392fe4a2d6287fc687abdf5992da34173ad668d32107269ed8805af6f24309ddd4af867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba073c201cf574fc6069252fb4e3b4da04fdc0b7e249e10598837dddf218f77b83ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa047e523f247c7f04664ca01c908f7ffb27e27a8e456da67781db73f57db2d9e3ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a08b8e793b91ce86c904320928b66ad360aa2b1699f1f21081428cb2a3116f047688160073661a8aa68cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86f1402353fc2111b88f5b874a3319255dc728afe813eb13cffc2bb6e8052437",
+        "lastblockhash" : "0xef69bb3846cb7eb9784ef08411dabf4b364866b88b5c223c845f8690fcdf7dd6",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -124,263 +124,13 @@
             }
         }
     },
-    "Call1024PreCalls_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "172420b157fd5d569b28af9769feffba947a2a5b2a2b6b0d700b5ecdc18dd4e1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x022d84a6",
-                    "hash" : "0xed2618713763556361015acef233bca5b6e3fd6f664a61d26338b90bbe1a3e0a",
-                    "mixHash" : "0x9a04c9bd5542897d389e39961ac63b88742f9e964e22233c7846ff8ac4bf3a2b",
-                    "nonce" : "0x877c436bf31c737c",
-                    "number" : "0x01",
-                    "parentHash" : "0x788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21",
-                    "receiptTrie" : "0xcce5d2b39411f65c1e5d61b414b536570fac30260051295bd70fa44bad2b5828",
-                    "stateRoot" : "0x17d0ae8e9cf2f1fa0988473cb8f56482eddaf030e1273ccf50c93480febce2e0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea0788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba017d0ae8e9cf2f1fa0988473cb8f56482eddaf030e1273ccf50c93480febce2e0a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0cce5d2b39411f65c1e5d61b414b536570fac30260051295bd70fa44bad2b5828b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a09a04c9bd5542897d389e39961ac63b88742f9e964e22233c7846ff8ac4bf3a2b88877c436bf31c737cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed2618713763556361015acef233bca5b6e3fd6f664a61d26338b90bbe1a3e0a",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0ffffffffffffffffffffffffffdd27b4f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2320",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182472184a6",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2a",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x03e4",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024PreCalls_d0g0v0_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/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "172420b157fd5d569b28af9769feffba947a2a5b2a2b6b0d700b5ecdc18dd4e1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x022d84a6",
-                    "hash" : "0x517bc289e4e566b28a9c9c824ef69d73c84d66e6040bf8e8e731b5826b3900c8",
-                    "mixHash" : "0x6a82333cf03dc4bcd35455eecc20119bf32ca792ee5776b4d39596df5835e851",
-                    "nonce" : "0x023785bd9965fae8",
-                    "number" : "0x01",
-                    "parentHash" : "0x788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21",
-                    "receiptTrie" : "0xcce5d2b39411f65c1e5d61b414b536570fac30260051295bd70fa44bad2b5828",
-                    "stateRoot" : "0x17d0ae8e9cf2f1fa0988473cb8f56482eddaf030e1273ccf50c93480febce2e0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea0788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba017d0ae8e9cf2f1fa0988473cb8f56482eddaf030e1273ccf50c93480febce2e0a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0cce5d2b39411f65c1e5d61b414b536570fac30260051295bd70fa44bad2b5828b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a06a82333cf03dc4bcd35455eecc20119bf32ca792ee5776b4d39596df5835e85188023785bd9965fae8f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x517bc289e4e566b28a9c9c824ef69d73c84d66e6040bf8e8e731b5826b3900c8",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0ffffffffffffffffffffffffffdd27b4f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2320",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182472184a6",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2a",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x03e4",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Call1024PreCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "172420b157fd5d569b28af9769feffba947a2a5b2a2b6b0d700b5ecdc18dd4e1"
+            "sourceHash" : "0411298763213d9e793ebde256cbcb75ac654f7bf3b53b988bbcd3f6eab29be0"
         },
         "blocks" : [
             {
@@ -391,9 +141,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x100000018545",
-                    "hash" : "0xb4e2c6bc6dd04531ad4bc9f4fd1bed52b9b01351fc8925c37a3eaf9bfdd65a18",
-                    "mixHash" : "0xdd47ddb09545779945dafdd80eeae311e342fc43306f08da7404ae3c112b7f6c",
-                    "nonce" : "0x6f6525674f82ab8f",
+                    "hash" : "0xcb4879545c8abd8e7fe224e860419597fe53c82c3c2ca4cce12ef833ada1c742",
+                    "mixHash" : "0xcd80ee7017e9fa394bf3fdf0ee5b94ef602e3bf1db19a0ffb9a176629d883231",
+                    "nonce" : "0x683cae716424c740",
                     "number" : "0x01",
                     "parentHash" : "0x788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21",
                     "receiptTrie" : "0xd822a5b986292e6f3b6870840b4f7c31202b1947259295c9e61092ddbe9619de",
@@ -402,10 +152,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a0788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e1c0d87415feea9fff73517c3a69fdb85282e51e88dc879a83429c3bf6d8e3aca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d822a5b986292e6f3b6870840b4f7c31202b1947259295c9e61092ddbe9619deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a0dd47ddb09545779945dafdd80eeae311e342fc43306f08da7404ae3c112b7f6c886f6525674f82ab8ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a0788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e1c0d87415feea9fff73517c3a69fdb85282e51e88dc879a83429c3bf6d8e3aca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d822a5b986292e6f3b6870840b4f7c31202b1947259295c9e61092ddbe9619deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a0cd80ee7017e9fa394bf3fdf0ee5b94ef602e3bf1db19a0ffb9a176629d88323188683cae716424c740f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -439,7 +189,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4e2c6bc6dd04531ad4bc9f4fd1bed52b9b01351fc8925c37a3eaf9bfdd65a18",
+        "lastblockhash" : "0xcb4879545c8abd8e7fe224e860419597fe53c82c3c2ca4cce12ef833ada1c742",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -497,129 +247,5 @@
                 }
             }
         }
-    },
-    "Call1024PreCalls_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "172420b157fd5d569b28af9769feffba947a2a5b2a2b6b0d700b5ecdc18dd4e1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x100000018545",
-                    "hash" : "0xd93c10c45b6d6f5c9c58e94f8207421537493f17bfff2862012300258be0ab0a",
-                    "mixHash" : "0x0f20e4cbce6748abf6a4e0c3f30d7f0819950531f0154621a92301463728d5e8",
-                    "nonce" : "0x6cb977d87a94ddcb",
-                    "number" : "0x01",
-                    "parentHash" : "0x788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21",
-                    "receiptTrie" : "0xd822a5b986292e6f3b6870840b4f7c31202b1947259295c9e61092ddbe9619de",
-                    "stateRoot" : "0xe1c0d87415feea9fff73517c3a69fdb85282e51e88dc879a83429c3bf6d8e3ac",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026df90200a0788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e1c0d87415feea9fff73517c3a69fdb85282e51e88dc879a83429c3bf6d8e3aca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d822a5b986292e6f3b6870840b4f7c31202b1947259295c9e61092ddbe9619deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a00f20e4cbce6748abf6a4e0c3f30d7f0819950531f0154621a92301463728d5e8886cb977d87a94ddcbf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x788f8077ce958c1cb8641fffe70196affaf39b1a8b7330e7cd8af0266f648f21",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd93c10c45b6d6f5c9c58e94f8207421537493f17bfff2862012300258be0ab0a",
-        "network" : "Homestead",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffeffffffe7ab0",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b5a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563a18244f58545",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07f0",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0.json
index 0e3e3ffd7..5a18b822d 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "CallLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "353798a3c4ffa6658b4422296e7b2f947bf8f10b29c2b52515a25f3ddadef680"
+            "sourceHash" : "c9695cd004e9ce7ffe1414168e9850b044d9c4ac1aff1eeca9fc6e327962f364"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dcb",
-                    "hash" : "0x2b5da41df59d7f2681366cf3df19f281a5c4a616eeafb0e32dd029b29e36af9d",
-                    "mixHash" : "0xd3457a78cccf18bd08f191f437ebbe72d482321fb9b9e517c622c0f0ec4490aa",
-                    "nonce" : "0x538ecec8a276fa1b",
+                    "hash" : "0x867188c76999b480057c378fbbf3fded41caa71dcd705f57994c6d6fb4caf05a",
+                    "mixHash" : "0xc5948c6b6a9777d8cf55d2515190391168b7e2c8b0c0cc3b88c02bbe23477553",
+                    "nonce" : "0xb0cd99c1b4a3c278",
                     "number" : "0x01",
                     "parentHash" : "0xeccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63",
                     "receiptTrie" : "0x8082cf6bd49c8ccb443c8537c42f533fc1071ac7e89c0d344765ff74c3a90cfa",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x6225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0eccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a516ab3b5224a57f9055e55cffbd7f45283da42141699438e8dec63adba65a7ca06225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86a08082cf6bd49c8ccb443c8537c42f533fc1071ac7e89c0d344765ff74c3a90cfab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dcb8203e880a0d3457a78cccf18bd08f191f437ebbe72d482321fb9b9e517c622c0f0ec4490aa88538ecec8a276fa1bf867f8658001887fffffffffffffff94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca07c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284aa00e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ecc0",
+                "rlp" : "0xf9026af901fda0eccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a516ab3b5224a57f9055e55cffbd7f45283da42141699438e8dec63adba65a7ca06225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86a08082cf6bd49c8ccb443c8537c42f533fc1071ac7e89c0d344765ff74c3a90cfab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dcb8203e880a0c5948c6b6a9777d8cf55d2515190391168b7e2c8b0c0cc3b88c02bbe2347755388b0cd99c1b4a3c278f867f8658001887fffffffffffffff94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca07c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284aa00e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ecc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7fffffffffffffff",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba03774f9a9e90022b813780077ec2d1464983b5ffe74c332103f9b89b823554618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2b5da41df59d7f2681366cf3df19f281a5c4a616eeafb0e32dd029b29e36af9d",
+        "lastblockhash" : "0x867188c76999b480057c378fbbf3fded41caa71dcd705f57994c6d6fb4caf05a",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -122,259 +122,13 @@
             }
         }
     },
-    "CallLoseGasOOG_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "353798a3c4ffa6658b4422296e7b2f947bf8f10b29c2b52515a25f3ddadef680"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028dcb",
-                    "hash" : "0x165ed4db1ad86639928009c1cd5efe987dd4d3116993952e2e6cd31a89a13308",
-                    "mixHash" : "0x2aa938943b3500c7261d5008a53aa1441a7facffacdfd2ccb1aa02bbdee834c4",
-                    "nonce" : "0x14e56e56bde12893",
-                    "number" : "0x01",
-                    "parentHash" : "0xeccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63",
-                    "receiptTrie" : "0xa792a8b70cd03f7b3d4ddfc9b517111388c35a0f8d04f14ae770e3870b49e317",
-                    "stateRoot" : "0xd8d21394408c42a87702d4f36623bdbe1c5ec8374f312d87154a23a8ae65ca34",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0eccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d8d21394408c42a87702d4f36623bdbe1c5ec8374f312d87154a23a8ae65ca34a06225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86a0a792a8b70cd03f7b3d4ddfc9b517111388c35a0f8d04f14ae770e3870b49e317b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dcb8203e880a02aa938943b3500c7261d5008a53aa1441a7facffacdfd2ccb1aa02bbdee834c48814e56e56bde12893f867f8658001887fffffffffffffff94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca07c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284aa00e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ecc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7fffffffffffffff",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x7c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284a",
-                        "s" : "0x0e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ec",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xeccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3774f9a9e90022b813780077ec2d1464983b5ffe74c332103f9b89b823554618",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba03774f9a9e90022b813780077ec2d1464983b5ffe74c332103f9b89b823554618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x165ed4db1ad86639928009c1cd5efe987dd4d3116993952e2e6cd31a89a13308",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd722a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68dcb",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x03e9"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "CallLoseGasOOG_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "353798a3c4ffa6658b4422296e7b2f947bf8f10b29c2b52515a25f3ddadef680"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028dcb",
-                    "hash" : "0x581f5449bc6585e20153f8f7f315e42305dbfada4199e77f189432035c8930ca",
-                    "mixHash" : "0x6ab8dae34d38d330d77476953db5cd2b1c49b37ed0583c1fb159582fde6d88ee",
-                    "nonce" : "0x9e6f8c7b8c073d71",
-                    "number" : "0x01",
-                    "parentHash" : "0xeccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63",
-                    "receiptTrie" : "0xa792a8b70cd03f7b3d4ddfc9b517111388c35a0f8d04f14ae770e3870b49e317",
-                    "stateRoot" : "0xd8d21394408c42a87702d4f36623bdbe1c5ec8374f312d87154a23a8ae65ca34",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0eccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d8d21394408c42a87702d4f36623bdbe1c5ec8374f312d87154a23a8ae65ca34a06225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86a0a792a8b70cd03f7b3d4ddfc9b517111388c35a0f8d04f14ae770e3870b49e317b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dcb8203e880a06ab8dae34d38d330d77476953db5cd2b1c49b37ed0583c1fb159582fde6d88ee889e6f8c7b8c073d71f867f8658001887fffffffffffffff94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca07c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284aa00e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ecc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7fffffffffffffff",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x7c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284a",
-                        "s" : "0x0e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ec",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xeccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3774f9a9e90022b813780077ec2d1464983b5ffe74c332103f9b89b823554618",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba03774f9a9e90022b813780077ec2d1464983b5ffe74c332103f9b89b823554618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x581f5449bc6585e20153f8f7f315e42305dbfada4199e77f189432035c8930ca",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd722a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68dcb",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x03e9"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "CallLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "353798a3c4ffa6658b4422296e7b2f947bf8f10b29c2b52515a25f3ddadef680"
+            "sourceHash" : "c9695cd004e9ce7ffe1414168e9850b044d9c4ac1aff1eeca9fc6e327962f364"
         },
         "blocks" : [
             {
@@ -385,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028975",
-                    "hash" : "0xc15993a1782d8c7c143cf9b0a64059445c8cbbc3245cf634842406a2c3d4f99e",
-                    "mixHash" : "0x5cd6d3f179f7c7c6374efa66afdb2064840a87d53d754a1f88042f6d5a0dde3e",
-                    "nonce" : "0x2c6bbff48aad6ebe",
+                    "hash" : "0xc26bbe49cb4f2da8a8dd9efe33a7b35d2704e46d42e6f82434367b9ec98c0b98",
+                    "mixHash" : "0x724541dbf5efaf461913fae426cf69bc2bb7bbfeae405510aba2d170623753e4",
+                    "nonce" : "0xa8be02662912354c",
                     "number" : "0x01",
                     "parentHash" : "0xeccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63",
                     "receiptTrie" : "0x6efccba8b9b67d77a0296a0b37203bd902246f6315ee52f187b2d5220e588544",
@@ -396,10 +150,10 @@
                     "transactionsTrie" : "0x6225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0eccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0da1bce285ec7accdaf98351d982af95ee0d659b055eb924756747749540ec2f6a06225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86a06efccba8b9b67d77a0296a0b37203bd902246f6315ee52f187b2d5220e588544b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a05cd6d3f179f7c7c6374efa66afdb2064840a87d53d754a1f88042f6d5a0dde3e882c6bbff48aad6ebef867f8658001887fffffffffffffff94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca07c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284aa00e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ecc0",
+                "rlp" : "0xf9026af901fda0eccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0da1bce285ec7accdaf98351d982af95ee0d659b055eb924756747749540ec2f6a06225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86a06efccba8b9b67d77a0296a0b37203bd902246f6315ee52f187b2d5220e588544b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a0724541dbf5efaf461913fae426cf69bc2bb7bbfeae405510aba2d170623753e488a8be02662912354cf867f8658001887fffffffffffffff94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca07c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284aa00e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ecc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7fffffffffffffff",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -433,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba03774f9a9e90022b813780077ec2d1464983b5ffe74c332103f9b89b823554618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc15993a1782d8c7c143cf9b0a64059445c8cbbc3245cf634842406a2c3d4f99e",
+        "lastblockhash" : "0xc26bbe49cb4f2da8a8dd9efe33a7b35d2704e46d42e6f82434367b9ec98c0b98",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -490,128 +244,5 @@
                 }
             }
         }
-    },
-    "CallLoseGasOOG_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "353798a3c4ffa6658b4422296e7b2f947bf8f10b29c2b52515a25f3ddadef680"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028975",
-                    "hash" : "0x474294ef74b8612bec183e248442cd1f08c162255349b890fac7cda8de6942db",
-                    "mixHash" : "0x4c4293386ccf74dcacfcca11f47d0e4788e298790cf8492d9c85aaa8abb507b3",
-                    "nonce" : "0x66401df09c427a22",
-                    "number" : "0x01",
-                    "parentHash" : "0xeccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63",
-                    "receiptTrie" : "0x6efccba8b9b67d77a0296a0b37203bd902246f6315ee52f187b2d5220e588544",
-                    "stateRoot" : "0xda1bce285ec7accdaf98351d982af95ee0d659b055eb924756747749540ec2f6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0eccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0da1bce285ec7accdaf98351d982af95ee0d659b055eb924756747749540ec2f6a06225be0edd688cfb6cd0ce8477be236f0d21173b3d261f955a48e3c7c1552d86a06efccba8b9b67d77a0296a0b37203bd902246f6315ee52f187b2d5220e588544b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a04c4293386ccf74dcacfcca11f47d0e4788e298790cf8492d9c85aaa8abb507b38866401df09c427a22f867f8658001887fffffffffffffff94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca07c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284aa00e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ecc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7fffffffffffffff",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x7c8b2f6209dca21f5254e6ed96210edcd5cfcf486c323728021ecfb3f281284a",
-                        "s" : "0x0e439853dadcc15c198e9849f635b6ec8f308f58bae809b84245ccb2d5afa4ec",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xeccee847cf727082ca35a74cf60b43c58acf0a050b9012529d5d6ed3ab753d63",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3774f9a9e90022b813780077ec2d1464983b5ffe74c332103f9b89b823554618",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba03774f9a9e90022b813780077ec2d1464983b5ffe74c332103f9b89b823554618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x474294ef74b8612bec183e248442cd1f08c162255349b890fac7cda8de6942db",
-        "network" : "Homestead",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7680",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68975",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x03e9"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f16001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0.json
index d6d25d52f..d916b4680 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombPreCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "1e5555571b05296f477108687ee4cd4ad2f6aa324a500be90f028c899c9570c9"
+            "sourceHash" : "bb704e0ad4cf78771bfe83560300318c8144a8ac530ec88bfbc3ce150e4d4336"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xac52dc",
-                    "hash" : "0x60c2dd763e1a047f5ba0aa51a3d2f6b0075409e1aca29d57ca4b94d059c96561",
-                    "mixHash" : "0xe56c47e8d01d9165d3c2991c2c90b70f2f43046c17b03262be6fff0e1028b940",
-                    "nonce" : "0x8822a05e078b7664",
+                    "hash" : "0x1338fc036cd61c23f1d104f7a04f4e5bcf82691d74017519b6c3bbadb0fb562e",
+                    "mixHash" : "0x27d05fa20e24a6f6014e393bc422b7bbb20faeaf8290f677723d45bf92555264",
+                    "nonce" : "0x46bba2e6b98b6118",
                     "number" : "0x01",
                     "parentHash" : "0x4031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263",
                     "receiptTrie" : "0xe3f1119ff1f089ce4747901421f5a5a8e091e194f9629650b003003573ee76ff",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda04031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa072e5a18ae9a7ba789f94f6a5f4d44681bab8d719e5a0b4491c0c2368018ed197a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0e3f1119ff1f089ce4747901421f5a5a8e091e194f9629650b003003573ee76ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83ac52dc8203e880a0e56c47e8d01d9165d3c2991c2c90b70f2f43046c17b03262be6fff0e1028b940888822a05e078b7664f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda04031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa072e5a18ae9a7ba789f94f6a5f4d44681bab8d719e5a0b4491c0c2368018ed197a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0e3f1119ff1f089ce4747901421f5a5a8e091e194f9629650b003003573ee76ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83ac52dc8203e880a027d05fa20e24a6f6014e393bc422b7bbb20faeaf8290f677723d45bf925552648846bba2e6b98b6118f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037145a9439632fb436afbd941e2c16fb5c939a6866aea0bbad7a16b930c2b40fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60c2dd763e1a047f5ba0aa51a3d2f6b0075409e1aca29d57ca4b94d059c96561",
+        "lastblockhash" : "0x1338fc036cd61c23f1d104f7a04f4e5bcf82691d74017519b6c3bbadb0fb562e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -129,273 +129,13 @@
             }
         }
     },
-    "CallRecursiveBombPreCall_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "1e5555571b05296f477108687ee4cd4ad2f6aa324a500be90f028c899c9570c9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xac52dc",
-                    "hash" : "0x8d2b5841bfc9ceb00695dfc2de093a7425824bfa2867078beccc82bdacf99a45",
-                    "mixHash" : "0xdddc2a0855a9c53d5bd5f130b6a22b02213e6027da1be251f86ad2a27f91284a",
-                    "nonce" : "0x1b0585726bd47a2e",
-                    "number" : "0x01",
-                    "parentHash" : "0x4031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263",
-                    "receiptTrie" : "0x2d8fe3fa3f358a47f1fb3aa2528e0c22f3b6005c2d9e00472a65d5c349905e47",
-                    "stateRoot" : "0x48ac5ac4a9059f8db1f9af05047c605749ba7901ac0481a87776526453602a32",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda04031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048ac5ac4a9059f8db1f9af05047c605749ba7901ac0481a87776526453602a32a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a02d8fe3fa3f358a47f1fb3aa2528e0c22f3b6005c2d9e00472a65d5c349905e47b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83ac52dc8203e880a0dddc2a0855a9c53d5bd5f130b6a22b02213e6027da1be251f86ad2a27f91284a881b0585726bd47a2ef867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
-                        "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x4031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x37145a9439632fb436afbd941e2c16fb5c939a6866aea0bbad7a16b930c2b40f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037145a9439632fb436afbd941e2c16fb5c939a6866aea0bbad7a16b930c2b40fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d2b5841bfc9ceb00695dfc2de093a7425824bfa2867078beccc82bdacf99a45",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffd1",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1506000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245a052dc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640017",
-                "code" : "0x600160005401600055600060006000600060003062036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0400",
-                    "0x01" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffff53ad23",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1506000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600160005401600055600060006000600060003062036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "CallRecursiveBombPreCall_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "1e5555571b05296f477108687ee4cd4ad2f6aa324a500be90f028c899c9570c9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xac52dc",
-                    "hash" : "0x8257ce878404a39d378594c74b02bec22d8116a035d9a95404a3cc815b3e620b",
-                    "mixHash" : "0xca727ebe9384b1ca8d3a50f5b26426418a601d705a8a93100a970de2911565bf",
-                    "nonce" : "0xe05b771e71adba04",
-                    "number" : "0x01",
-                    "parentHash" : "0x4031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263",
-                    "receiptTrie" : "0x2d8fe3fa3f358a47f1fb3aa2528e0c22f3b6005c2d9e00472a65d5c349905e47",
-                    "stateRoot" : "0x48ac5ac4a9059f8db1f9af05047c605749ba7901ac0481a87776526453602a32",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda04031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048ac5ac4a9059f8db1f9af05047c605749ba7901ac0481a87776526453602a32a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a02d8fe3fa3f358a47f1fb3aa2528e0c22f3b6005c2d9e00472a65d5c349905e47b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83ac52dc8203e880a0ca727ebe9384b1ca8d3a50f5b26426418a601d705a8a93100a970de2911565bf88e05b771e71adba04f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
-                        "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x4031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x37145a9439632fb436afbd941e2c16fb5c939a6866aea0bbad7a16b930c2b40f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037145a9439632fb436afbd941e2c16fb5c939a6866aea0bbad7a16b930c2b40fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8257ce878404a39d378594c74b02bec22d8116a035d9a95404a3cc815b3e620b",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffd1",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1506000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245a052dc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640017",
-                "code" : "0x600160005401600055600060006000600060003062036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0400",
-                    "0x01" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffff53ad23",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1506000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600160005401600055600060006000600060003062036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "CallRecursiveBombPreCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "1e5555571b05296f477108687ee4cd4ad2f6aa324a500be90f028c899c9570c9"
+            "sourceHash" : "bb704e0ad4cf78771bfe83560300318c8144a8ac530ec88bfbc3ce150e4d4336"
         },
         "blocks" : [
             {
@@ -406,9 +146,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x9fa5b4",
-                    "hash" : "0x922c7259cbdfcb0ce5ec1f6cd0b3b2e1eb9ec94201ab4a791d973837b2a1a00c",
-                    "mixHash" : "0xcea908c3edf19f0c417faf3dee31f18826eb0cd0bf7839a38056cfff3eb00d92",
-                    "nonce" : "0x5532dfd67a30cca8",
+                    "hash" : "0xfb72141759df18af2e8c26d1ae898ad7e4bc5f1f5e303b63efb575e9a06d07c9",
+                    "mixHash" : "0x4fc6eaef93cdf56bf9edabe3da043ff7bbf7714db17f665c4eb2b401bbaa8e7c",
+                    "nonce" : "0x0408407ed4fbd853",
                     "number" : "0x01",
                     "parentHash" : "0x4031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263",
                     "receiptTrie" : "0x6e1157ff51032d1ecf4f9977e7f9262209b9f3856d7811b8ab673b1f18578921",
@@ -417,10 +157,10 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda04031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e32cf75e6cd4535f068ac6cd7c2c3f2a31b356b4ae875fce0d8e217ae1c6fb69a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a06e1157ff51032d1ecf4f9977e7f9262209b9f3856d7811b8ab673b1f18578921b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff839fa5b48203e880a0cea908c3edf19f0c417faf3dee31f18826eb0cd0bf7839a38056cfff3eb00d92885532dfd67a30cca8f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda04031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e32cf75e6cd4535f068ac6cd7c2c3f2a31b356b4ae875fce0d8e217ae1c6fb69a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a06e1157ff51032d1ecf4f9977e7f9262209b9f3856d7811b8ab673b1f18578921b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff839fa5b48203e880a04fc6eaef93cdf56bf9edabe3da043ff7bbf7714db17f665c4eb2b401bbaa8e7c880408407ed4fbd853f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -454,7 +194,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037145a9439632fb436afbd941e2c16fb5c939a6866aea0bbad7a16b930c2b40fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x922c7259cbdfcb0ce5ec1f6cd0b3b2e1eb9ec94201ab4a791d973837b2a1a00c",
+        "lastblockhash" : "0xfb72141759df18af2e8c26d1ae898ad7e4bc5f1f5e303b63efb575e9a06d07c9",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -518,135 +258,5 @@
                 }
             }
         }
-    },
-    "CallRecursiveBombPreCall_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "1e5555571b05296f477108687ee4cd4ad2f6aa324a500be90f028c899c9570c9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x9fa5b4",
-                    "hash" : "0x26fbc9adfe6ca2219acc2f7ecb533b3e231ae6fefad7bcb5f803cdaeddc55bf4",
-                    "mixHash" : "0xe100224926132b7f299b86ff214f0a301273c1d037c17c5c2fb178f5fadc7afe",
-                    "nonce" : "0x17aad348498a32a9",
-                    "number" : "0x01",
-                    "parentHash" : "0x4031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263",
-                    "receiptTrie" : "0x6e1157ff51032d1ecf4f9977e7f9262209b9f3856d7811b8ab673b1f18578921",
-                    "stateRoot" : "0xe32cf75e6cd4535f068ac6cd7c2c3f2a31b356b4ae875fce0d8e217ae1c6fb69",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda04031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e32cf75e6cd4535f068ac6cd7c2c3f2a31b356b4ae875fce0d8e217ae1c6fb69a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a06e1157ff51032d1ecf4f9977e7f9262209b9f3856d7811b8ab673b1f18578921b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff839fa5b48203e880a0e100224926132b7f299b86ff214f0a301273c1d037c17c5c2fb178f5fadc7afe8817aad348498a32a9f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
-                        "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x4031264a6528e887ecdcb11e6354d34da7a6d4ad2510992b151e9f5d18e5c263",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x37145a9439632fb436afbd941e2c16fb5c939a6866aea0bbad7a16b930c2b40f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037145a9439632fb436afbd941e2c16fb5c939a6866aea0bbad7a16b930c2b40fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26fbc9adfe6ca2219acc2f7ecb533b3e231ae6fefad7bcb5f803cdaeddc55bf4",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffd1",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1506000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824593a5b4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640017",
-                "code" : "0x600160005401600055600060006000600060003062036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0400",
-                    "0x01" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffff605a4b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f1506000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff1",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600160005401600055600060006000600060003062036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0.json
index aa64c64c4..2bdb62d60 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0.json
@@ -2,10 +2,10 @@
     "Callcode1024BalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e1fcabfa3b5b320e85380ebfd573f42e24cb800f78fee1c61d72b29d5fb32374"
+            "sourceHash" : "e17272d1d06d95a67afdb9b02298b7b79d23e87c8fadc6b264f5fccf6a59ddbe"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "0x42e145b4aa72bd1a60f663cec7c774be350a46ec10f624abf8a9ce2d2323fcd3",
-                    "mixHash" : "0x7fd25b47f853062ba60419da308ec59974bd7abf7cc308f956fc9afe49af495e",
-                    "nonce" : "0xa2101bc5d7cef64f",
+                    "hash" : "0xc897389c9ed1f41812400bf129d8d1541d71a83364066add0b8e1ed465ccafbc",
+                    "mixHash" : "0x7d3a646aeaab51a0629997ed65ca45b2459b145e103e09267b1f60001d02f180",
+                    "nonce" : "0x443112e01cccc71b",
                     "number" : "0x01",
                     "parentHash" : "0xd6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9c",
                     "receiptTrie" : "0x3916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548b",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0d6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08caf4c25b43618f0a45ac9b5b55ca6d2aa7aab2dfd181a07c0b2667187f3cbb4a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a07fd25b47f853062ba60419da308ec59974bd7abf7cc308f956fc9afe49af495e88a2101bc5d7cef64ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0d6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08caf4c25b43618f0a45ac9b5b55ca6d2aa7aab2dfd181a07c0b2667187f3cbb4a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a07d3a646aeaab51a0629997ed65ca45b2459b145e103e09267b1f60001d02f18088443112e01cccc71bf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42e145b4aa72bd1a60f663cec7c774be350a46ec10f624abf8a9ce2d2323fcd3",
+        "lastblockhash" : "0xc897389c9ed1f41812400bf129d8d1541d71a83364066add0b8e1ed465ccafbc",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -122,259 +122,13 @@
             }
         }
     },
-    "Callcode1024BalanceTooLow_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e1fcabfa3b5b320e85380ebfd573f42e24cb800f78fee1c61d72b29d5fb32374"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x0117bce4",
-                    "hash" : "0x499d5b5be2929f0ced9968b86eeac0fdae975ca2f9ea85a01eba67780a666bf7",
-                    "mixHash" : "0x11f5211a03ffd08f0fad931cc13fa1855cdecb36fef834c24c60fce0aace18e6",
-                    "nonce" : "0xdfccdd31b24db79d",
-                    "number" : "0x01",
-                    "parentHash" : "0xd6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9c",
-                    "receiptTrie" : "0x6cae40ca99407602e63192f90907e480d1d7cabf287d6eb2aa2f3552af1093c5",
-                    "stateRoot" : "0x53d53a89c032814d696884237f39723dd01b23aa33e67487a6bd47e78e666bdd",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea0d6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba053d53a89c032814d696884237f39723dd01b23aa33e67487a6bd47e78e666bdda05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06cae40ca99407602e63192f90907e480d1d7cabf287d6eb2aa2f3552af1093c5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a011f5211a03ffd08f0fad931cc13fa1855cdecb36fef834c24c60fce0aace18e688dfccdd31b24db79df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xd6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9c",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x499d5b5be2929f0ced9968b86eeac0fdae975ca2f9ea85a01eba67780a666bf7",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffee84311",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182460bbce4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Callcode1024BalanceTooLow_d0g0v0_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/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e1fcabfa3b5b320e85380ebfd573f42e24cb800f78fee1c61d72b29d5fb32374"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x0117bce4",
-                    "hash" : "0x58c0581f3747b6655874018bfed7f63a0e0027db7db81fca5c3793ccd3ad1bf5",
-                    "mixHash" : "0xe088b302017f6817fbcbdcc00259a4acece2cc83c5026974a1e46a9b3902e8ee",
-                    "nonce" : "0xb4ceafef40646885",
-                    "number" : "0x01",
-                    "parentHash" : "0xd6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9c",
-                    "receiptTrie" : "0x6cae40ca99407602e63192f90907e480d1d7cabf287d6eb2aa2f3552af1093c5",
-                    "stateRoot" : "0x53d53a89c032814d696884237f39723dd01b23aa33e67487a6bd47e78e666bdd",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea0d6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba053d53a89c032814d696884237f39723dd01b23aa33e67487a6bd47e78e666bdda05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06cae40ca99407602e63192f90907e480d1d7cabf287d6eb2aa2f3552af1093c5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a0e088b302017f6817fbcbdcc00259a4acece2cc83c5026974a1e46a9b3902e8ee88b4ceafef40646885f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xd6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9c",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58c0581f3747b6655874018bfed7f63a0e0027db7db81fca5c3793ccd3ad1bf5",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffee84311",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182460bbce4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Callcode1024BalanceTooLow_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e1fcabfa3b5b320e85380ebfd573f42e24cb800f78fee1c61d72b29d5fb32374"
+            "sourceHash" : "e17272d1d06d95a67afdb9b02298b7b79d23e87c8fadc6b264f5fccf6a59ddbe"
         },
         "blocks" : [
             {
@@ -385,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d787",
-                    "hash" : "0xe9fd9da3f7f8326d7545907ba9de219d31d60f94b1ffc2ec7852884af6c855c9",
-                    "mixHash" : "0x31af0691b595e95e3f97760fedfd8af21e81019cbad726319e000b35e8ffbe17",
-                    "nonce" : "0x0385a3e53ad9f847",
+                    "hash" : "0x4d1c321de51de9e113488efa27231880a6f8f43c54de7139fb3a98d51edc516d",
+                    "mixHash" : "0xc157131d1c3854387722e57d86cadd8a599128c2a764cb6a7d29a319d5d6e949",
+                    "nonce" : "0xfcaf7d81e1bacb17",
                     "number" : "0x01",
                     "parentHash" : "0xd6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9c",
                     "receiptTrie" : "0xd89c9655e680978283cb725af6ed65b81fefdb6dcea61eeca4db61e318f64f4c",
@@ -396,10 +150,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a0d6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba088cf86b5918585ffe95e581eadbd8372a528b4fb6a0d8e9951ede1c52247dd27a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d89c9655e680978283cb725af6ed65b81fefdb6dcea61eeca4db61e318f64f4cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a031af0691b595e95e3f97760fedfd8af21e81019cbad726319e000b35e8ffbe17880385a3e53ad9f847f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a0d6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba088cf86b5918585ffe95e581eadbd8372a528b4fb6a0d8e9951ede1c52247dd27a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d89c9655e680978283cb725af6ed65b81fefdb6dcea61eeca4db61e318f64f4cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0c157131d1c3854387722e57d86cadd8a599128c2a764cb6a7d29a319d5d6e94988fcaf7d81e1bacb17f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -433,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9fd9da3f7f8326d7545907ba9de219d31d60f94b1ffc2ec7852884af6c855c9",
+        "lastblockhash" : "0x4d1c321de51de9e113488efa27231880a6f8f43c54de7139fb3a98d51edc516d",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -489,127 +243,5 @@
                 }
             }
         }
-    },
-    "Callcode1024BalanceTooLow_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e1fcabfa3b5b320e85380ebfd573f42e24cb800f78fee1c61d72b29d5fb32374"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x10000000d787",
-                    "hash" : "0xef2666523ad696dec302d2c64f6efbb2858ba2ebf8a7929b4740f2e68bc2a009",
-                    "mixHash" : "0x432238eeb67afda5d7b4f4c6ab9cf18e6d20d909926a9ded5bf28bf17de88507",
-                    "nonce" : "0xf19c6eb3ae27b681",
-                    "number" : "0x01",
-                    "parentHash" : "0xd6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9c",
-                    "receiptTrie" : "0xd89c9655e680978283cb725af6ed65b81fefdb6dcea61eeca4db61e318f64f4c",
-                    "stateRoot" : "0x88cf86b5918585ffe95e581eadbd8372a528b4fb6a0d8e9951ede1c52247dd27",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026df90200a0d6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba088cf86b5918585ffe95e581eadbd8372a528b4fb6a0d8e9951ede1c52247dd27a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d89c9655e680978283cb725af6ed65b81fefdb6dcea61eeca4db61e318f64f4cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0432238eeb67afda5d7b4f4c6ab9cf18e6d20d909926a9ded5bf28bf17de8850788f19c6eb3ae27b681f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xd6987a2f86ac7e9f57791899ec40495b096c94a4502a7c6b2011b55e14281b9c",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef2666523ad696dec302d2c64f6efbb2858ba2ebf8a7929b4740f2e68bc2a009",
-        "network" : "Homestead",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffefffffff286e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563a18244f4d787",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0.json
index f20364bee..171d52b71 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "Callcode1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "2e5e2db585336858f3c9c609df4988a65213eea211bd5e7b9109f6f54964d6cb"
+            "sourceHash" : "19b835c71aa545944f990fecb4af27d7611428f4a339fa100032d42aeba217e7"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8804",
-                    "hash" : "0x364e19b3ecd8b9c077cdf28b858a4a5de490bdacafcb95a795fd059e8dd2f5f2",
-                    "mixHash" : "0x755f99ed270b1eef891e8bc1304fd400f8c70ff97d6ebb479a01c564968995bc",
-                    "nonce" : "0x57c6612c83f748ea",
+                    "hash" : "0x9bd9fbf653b0c91bea38e88fa80777d94de07b124392adaa04f05f5feabed8fd",
+                    "mixHash" : "0xf7e848d242c194820be1bcc807b8467a0980319a33d56330f4efb737a0d14cf5",
+                    "nonce" : "0x868f8e5f91df1a50",
                     "number" : "0x01",
                     "parentHash" : "0xc7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543",
                     "receiptTrie" : "0x1917d25d782b054277e41445ea09173abe2af947a2729c58d812fc71083cd58a",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0c7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a0b2c12dfd7bf257f1ef3b9635f4b649eee1916ff701d84cd6c2f93d9520382aa005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01917d25d782b054277e41445ea09173abe2af947a2729c58d812fc71083cd58ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a88048203e880a0755f99ed270b1eef891e8bc1304fd400f8c70ff97d6ebb479a01c564968995bc8857c6612c83f748eaf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0c7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a0b2c12dfd7bf257f1ef3b9635f4b649eee1916ff701d84cd6c2f93d9520382aa005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01917d25d782b054277e41445ea09173abe2af947a2729c58d812fc71083cd58ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a88048203e880a0f7e848d242c194820be1bcc807b8467a0980319a33d56330f4efb737a0d14cf588868f8e5f91df1a50f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b90619a263ad614809c6cdc033921a76991480f154baa3438d3897f380449e0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x364e19b3ecd8b9c077cdf28b858a4a5de490bdacafcb95a795fd059e8dd2f5f2",
+        "lastblockhash" : "0x9bd9fbf653b0c91bea38e88fa80777d94de07b124392adaa04f05f5feabed8fd",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -123,261 +123,13 @@
             }
         }
     },
-    "Callcode1024OOG_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/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "2e5e2db585336858f3c9c609df4988a65213eea211bd5e7b9109f6f54964d6cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8804",
-                    "hash" : "0x13f125fe3b229a31f24b7869491afad5f8a90113ca93ae4c3097c96e5f3e009e",
-                    "mixHash" : "0xdec1495c9870b0db7f048f3e3b280a7b397d9128a374c980d77a62f29f343cd6",
-                    "nonce" : "0x2110f38a3a75aed2",
-                    "number" : "0x01",
-                    "parentHash" : "0xc7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543",
-                    "receiptTrie" : "0x9f4cc9df9d1faea4af814b4636cdd4680f4a1162663eb64de59faad12e317d89",
-                    "stateRoot" : "0x95945da628218ad72b6f07358e8aaaffe8e02a405ad3cc1d1fbc42d966934f07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0c7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba095945da628218ad72b6f07358e8aaaffe8e02a405ad3cc1d1fbc42d966934f07a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca09f4cc9df9d1faea4af814b4636cdd4680f4a1162663eb64de59faad12e317d89b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a88048203e880a0dec1495c9870b0db7f048f3e3b280a7b397d9128a374c980d77a62f29f343cd6882110f38a3a75aed2f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xc7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb90619a263ad614809c6cdc033921a76991480f154baa3438d3897f380449e0f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b90619a263ad614809c6cdc033921a76991480f154baa3438d3897f380449e0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13f125fe3b229a31f24b7869491afad5f8a90113ca93ae4c3097c96e5f3e009e",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc577f1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8804",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x85",
-                    "0x01" : "0x01",
-                    "0x02" : "0x020789"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Callcode1024OOG_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/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "2e5e2db585336858f3c9c609df4988a65213eea211bd5e7b9109f6f54964d6cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8804",
-                    "hash" : "0x90b382915638bd717d43ee80b3fc08f0302ff4646ae1959124252b4b941a543d",
-                    "mixHash" : "0x6738cfd9c8fa069d7293dfae5d4b081cf90c486890aa9a71158cb410cd059c5a",
-                    "nonce" : "0xf31d8d18c165c282",
-                    "number" : "0x01",
-                    "parentHash" : "0xc7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543",
-                    "receiptTrie" : "0x9f4cc9df9d1faea4af814b4636cdd4680f4a1162663eb64de59faad12e317d89",
-                    "stateRoot" : "0x95945da628218ad72b6f07358e8aaaffe8e02a405ad3cc1d1fbc42d966934f07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0c7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba095945da628218ad72b6f07358e8aaaffe8e02a405ad3cc1d1fbc42d966934f07a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca09f4cc9df9d1faea4af814b4636cdd4680f4a1162663eb64de59faad12e317d89b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a88048203e880a06738cfd9c8fa069d7293dfae5d4b081cf90c486890aa9a71158cb410cd059c5a88f31d8d18c165c282f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xc7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb90619a263ad614809c6cdc033921a76991480f154baa3438d3897f380449e0f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b90619a263ad614809c6cdc033921a76991480f154baa3438d3897f380449e0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90b382915638bd717d43ee80b3fc08f0302ff4646ae1959124252b4b941a543d",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc577f1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8804",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x85",
-                    "0x01" : "0x01",
-                    "0x02" : "0x020789"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Callcode1024OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "2e5e2db585336858f3c9c609df4988a65213eea211bd5e7b9109f6f54964d6cb"
+            "sourceHash" : "19b835c71aa545944f990fecb4af27d7611428f4a339fa100032d42aeba217e7"
         },
         "blocks" : [
             {
@@ -388,9 +140,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefe179",
-                    "hash" : "0xe89a695d08e12051cb67ea52bd43c0eed94b85b3c9bd14d4f70097e438d12bf8",
-                    "mixHash" : "0x35d689693085304178f79c95cc1fc847d6c8de12b19fda77174bc032f7158f4a",
-                    "nonce" : "0x44b275ff1205f7be",
+                    "hash" : "0x8af7d9a56688d48759a2290e30e1bfb1d094f0607bf6fd7e331ca0790ba76d00",
+                    "mixHash" : "0x2acf87a33a2bc93309f4ad4ae0e8e4ce710e80bce8b3ca5843a9b42587db046b",
+                    "nonce" : "0x92b9a7379a34a2a4",
                     "number" : "0x01",
                     "parentHash" : "0xc7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543",
                     "receiptTrie" : "0xec75ae00ef85501626cc8f3b7ed40ac6cb62d4a6d1ede6cc7e50331ac0647bb1",
@@ -399,10 +151,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0c7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b8bfccf969b516233d94d49d8d149279f6f0c08aaf334c7f31744a7e87b197e3a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0ec75ae00ef85501626cc8f3b7ed40ac6cb62d4a6d1ede6cc7e50331ac0647bb1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe1798203e880a035d689693085304178f79c95cc1fc847d6c8de12b19fda77174bc032f7158f4a8844b275ff1205f7bef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0c7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b8bfccf969b516233d94d49d8d149279f6f0c08aaf334c7f31744a7e87b197e3a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0ec75ae00ef85501626cc8f3b7ed40ac6cb62d4a6d1ede6cc7e50331ac0647bb1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe1798203e880a02acf87a33a2bc93309f4ad4ae0e8e4ce710e80bce8b3ca5843a9b42587db046b8892b9a7379a34a2a4f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -436,7 +188,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b90619a263ad614809c6cdc033921a76991480f154baa3438d3897f380449e0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe89a695d08e12051cb67ea52bd43c0eed94b85b3c9bd14d4f70097e438d12bf8",
+        "lastblockhash" : "0x8af7d9a56688d48759a2290e30e1bfb1d094f0607bf6fd7e331ca0790ba76d00",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -494,129 +246,5 @@
                 }
             }
         }
-    },
-    "Callcode1024OOG_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "2e5e2db585336858f3c9c609df4988a65213eea211bd5e7b9109f6f54964d6cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xefe179",
-                    "hash" : "0xcd1db084b0cbcf74af39efcaf0ba86d28969b6164ea12cff9872ec91d7b5b438",
-                    "mixHash" : "0xe2f6c9ea7db79ce5340832887ec01b2a1151ad1c3ef09397e8c33baead249081",
-                    "nonce" : "0xcdea907bf4ed7b54",
-                    "number" : "0x01",
-                    "parentHash" : "0xc7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543",
-                    "receiptTrie" : "0xec75ae00ef85501626cc8f3b7ed40ac6cb62d4a6d1ede6cc7e50331ac0647bb1",
-                    "stateRoot" : "0xb8bfccf969b516233d94d49d8d149279f6f0c08aaf334c7f31744a7e87b197e3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0c7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b8bfccf969b516233d94d49d8d149279f6f0c08aaf334c7f31744a7e87b197e3a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0ec75ae00ef85501626cc8f3b7ed40ac6cb62d4a6d1ede6cc7e50331ac0647bb1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe1798203e880a0e2f6c9ea7db79ce5340832887ec01b2a1151ad1c3ef09397e8c33baead24908188cdea907bf4ed7b54f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xc7bfb805ae475dca03cb5d4a0f33e2032f5d2778b5b8f4c65a034a94fc47a543",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb90619a263ad614809c6cdc033921a76991480f154baa3438d3897f380449e0f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0b90619a263ad614809c6cdc033921a76991480f154baa3438d3897f380449e0fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd1db084b0cbcf74af39efcaf0ba86d28969b6164ea12cff9872ec91d7b5b438",
-        "network" : "Homestead",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff101e7c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918245e3e179",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01",
-                    "0x02" : "0x0fa3e9"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0.json
index c2b09e1b5..a3e7677be 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "CallcodeLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "e8aff02c85a0eef9f78e9495705e2fca1a0f47943867923e0a6b82133b8a8f73"
+            "sourceHash" : "6f15afbb872c4bc3e128fc0d2b10f43f7f431a1affb59965d615ec9046060403"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x85b3bf421e9ddd8cc3f8bec92e8c1d871c65b032c20adfef00abafe581e92183",
-                    "mixHash" : "0x61e6eda6f49c1372367ce4164a7a24e352e8efea217ce2ae39ccb0fbaa99d78a",
-                    "nonce" : "0xeeab2111b35da961",
+                    "hash" : "0xa0ebeec2bf8610440295245fe1820a5cfa7c545a403b6eebeaaab81fa8aa91fb",
+                    "mixHash" : "0x419acc2478c926477651e5d96a289b84c477170d671da6d47928be5c0430c4f2",
+                    "nonce" : "0x7a3d010534a55d1a",
                     "number" : "0x01",
                     "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
                     "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1cde9cd4dcec0c7155293182a68ad1ccc144fb405db5adc4437d0fd28f3cdf6a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a061e6eda6f49c1372367ce4164a7a24e352e8efea217ce2ae39ccb0fbaa99d78a88eeab2111b35da961f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1cde9cd4dcec0c7155293182a68ad1ccc144fb405db5adc4437d0fd28f3cdf6a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0419acc2478c926477651e5d96a289b84c477170d671da6d47928be5c0430c4f2887a3d010534a55d1af862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85b3bf421e9ddd8cc3f8bec92e8c1d871c65b032c20adfef00abafe581e92183",
+        "lastblockhash" : "0xa0ebeec2bf8610440295245fe1820a5cfa7c545a403b6eebeaaab81fa8aa91fb",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -120,255 +120,13 @@
             }
         }
     },
-    "CallcodeLoseGasOOG_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "e8aff02c85a0eef9f78e9495705e2fca1a0f47943867923e0a6b82133b8a8f73"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028976",
-                    "hash" : "0x49719dfc1c1fc254a39766f8d545b3ae8f68273650472d48e52252768017e7d5",
-                    "mixHash" : "0x5aaa4651e3938558715f111338b60b9ee2f4de5f20d258bd65d29e693c064921",
-                    "nonce" : "0x98722535cd203da9",
-                    "number" : "0x01",
-                    "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
-                    "receiptTrie" : "0xaa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593",
-                    "stateRoot" : "0xfdc29f19d567970102f5f6bff32d560b744ad74bd575e524a930a61c720cae16",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fdc29f19d567970102f5f6bff32d560b744ad74bd575e524a930a61c720cae16a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0aa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a05aaa4651e3938558715f111338b60b9ee2f4de5f20d258bd65d29e693c0649218898722535cd203da9f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x028976",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
-                        "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1b",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49719dfc1c1fc254a39766f8d545b3ae8f68273650472d48e52252768017e7d5",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7689",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "CallcodeLoseGasOOG_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "e8aff02c85a0eef9f78e9495705e2fca1a0f47943867923e0a6b82133b8a8f73"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028976",
-                    "hash" : "0xcd6a0bc0832745c9f392345ea4e98ab60d3d137e7d2db3324fe99c82fcb68c72",
-                    "mixHash" : "0xd93877535392541b86799e2977d1b628139bb19abb5078c268cc006bd35803f1",
-                    "nonce" : "0x3480b57fa55c61b6",
-                    "number" : "0x01",
-                    "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
-                    "receiptTrie" : "0xaa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593",
-                    "stateRoot" : "0xfdc29f19d567970102f5f6bff32d560b744ad74bd575e524a930a61c720cae16",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fdc29f19d567970102f5f6bff32d560b744ad74bd575e524a930a61c720cae16a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0aa9e4e0eb3c84bc88a1166ec9f1764cbf5a6b51f68d7c4665e2ac72bc8cdb593b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0d93877535392541b86799e2977d1b628139bb19abb5078c268cc006bd35803f1883480b57fa55c61b6f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x028976",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
-                        "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1b",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd6a0bc0832745c9f392345ea4e98ab60d3d137e7d2db3324fe99c82fcb68c72",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7689",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "CallcodeLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "e8aff02c85a0eef9f78e9495705e2fca1a0f47943867923e0a6b82133b8a8f73"
+            "sourceHash" : "6f15afbb872c4bc3e128fc0d2b10f43f7f431a1affb59965d615ec9046060403"
         },
         "blocks" : [
             {
@@ -379,9 +137,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028975",
-                    "hash" : "0xd44e5847b8f0e852f20d54b86ee61b8d6131662f6d77302035e69bc3c0cac214",
-                    "mixHash" : "0x1c20b3f04bb8e75c494c2806d6e456915217dfd0d2fe1d98c26e7a3e87362959",
-                    "nonce" : "0x72dcc5397144e985",
+                    "hash" : "0xf9ce7b5d227f6ac6f7fb0da01fc95df90de34aa016e9ca82aa123135673bcde3",
+                    "mixHash" : "0xb9944997c9e213e92d22d633c3687a42d5839f3d92568029ee52ab479d73b005",
+                    "nonce" : "0xf1e9ad1a280c645e",
                     "number" : "0x01",
                     "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
                     "receiptTrie" : "0x7c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117",
@@ -390,10 +148,10 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e7d2f1636f028a937c16594cff5924fee6be72023553e0865180b692293a3f43a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a07c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a01c20b3f04bb8e75c494c2806d6e456915217dfd0d2fe1d98c26e7a3e873629598872dcc5397144e985f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e7d2f1636f028a937c16594cff5924fee6be72023553e0865180b692293a3f43a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a07c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a0b9944997c9e213e92d22d633c3687a42d5839f3d92568029ee52ab479d73b00588f1e9ad1a280c645ef862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -427,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd44e5847b8f0e852f20d54b86ee61b8d6131662f6d77302035e69bc3c0cac214",
+        "lastblockhash" : "0xf9ce7b5d227f6ac6f7fb0da01fc95df90de34aa016e9ca82aa123135673bcde3",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -484,128 +242,5 @@
                 }
             }
         }
-    },
-    "CallcodeLoseGasOOG_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "e8aff02c85a0eef9f78e9495705e2fca1a0f47943867923e0a6b82133b8a8f73"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028975",
-                    "hash" : "0xbf498abcfa96e1fa6a1bca764ba208a3a48c1a39bd1a9e1e273fd02136e2a765",
-                    "mixHash" : "0x155d7391a4b948b48cbaa0224a8713a4b06082681018cfc7e0f9c70975c896f2",
-                    "nonce" : "0xdfd1df7a8d9277ea",
-                    "number" : "0x01",
-                    "parentHash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
-                    "receiptTrie" : "0x7c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117",
-                    "stateRoot" : "0xe7d2f1636f028a937c16594cff5924fee6be72023553e0865180b692293a3f43",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e7d2f1636f028a937c16594cff5924fee6be72023553e0865180b692293a3f43a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a07c727398d64b0d559c225b783cf514430fc60849ab1de4812d1e7b3f52a76117b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289758203e880a0155d7391a4b948b48cbaa0224a8713a4b06082681018cfc7e0f9c70975c896f288dfd1df7a8d9277eaf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x028976",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
-                        "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1b",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x794985f53fdfd478f13fe31b4a5fad3097768e7e7db36fd8ce2f99a1c5510a18",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d1c36f61b4b956287b89b816523b4ea0ac62681f2ee03d0479118fc6db3690b9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf498abcfa96e1fa6a1bca764ba208a3a48c1a39bd1a9e1e273fd02136e2a765",
-        "network" : "Homestead",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7680",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68975",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x03e9"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0.json
index 0319c1b3b..5d392160b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "98b40da5d88eb159dfc9bb080de54d5958ba9e38469f534bca370ac25fa73e03"
+            "sourceHash" : "eca824a7147e58863e20ba2c857cf333b64b937e05cbf7d65a1b0a94714cf7ac"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xf13c",
-                    "hash" : "0x662c3c6229dbd6d155f96a37bcc2db6dc440cd7e1db4cc6600084a0cf3a5b7d1",
-                    "mixHash" : "0x0fda9c42571f266907320ee5a31e9ea5d5edd9f757508446b31dcc5c27936849",
-                    "nonce" : "0xfe49df3969158be3",
+                    "hash" : "0x5d65e7b661bfef257f0417507535a009b1bb0ab4c768a972bea472fdf76ff0dd",
+                    "mixHash" : "0x59b9f04adb185f1d30a92a7383c2aac0538eade843c0f8b5aeebafe487d925d5",
+                    "nonce" : "0x6a744a7fefe0097b",
                     "number" : "0x01",
                     "parentHash" : "0x615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eb",
                     "receiptTrie" : "0x143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7c",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fab45635f93e4a8eff3d41e097729cc3e7b3cbd28b1c399c22c32d2b1fc98c20a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a00fda9c42571f266907320ee5a31e9ea5d5edd9f757508446b31dcc5c2793684988fe49df3969158be3f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fab45635f93e4a8eff3d41e097729cc3e7b3cbd28b1c399c22c32d2b1fc98c20a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a059b9f04adb185f1d30a92a7383c2aac0538eade843c0f8b5aeebafe487d925d5886a744a7fefe0097bf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0936be9bc63557c0df30be6427cefa335f8695e4aeff6237ac190d1fd33f01c54a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x662c3c6229dbd6d155f96a37bcc2db6dc440cd7e1db4cc6600084a0cf3a5b7d1",
+        "lastblockhash" : "0x5d65e7b661bfef257f0417507535a009b1bb0ab4c768a972bea472fdf76ff0dd",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,259 +122,13 @@
             }
         }
     },
-    "callOutput1_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "98b40da5d88eb159dfc9bb080de54d5958ba9e38469f534bca370ac25fa73e03"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf13c",
-                    "hash" : "0x2e3c9ad05c7ae69a988ff5f13865b81a4df3944e5e4f133fe68cdc74476a4b6e",
-                    "mixHash" : "0xa0ae65f9e53aa2546c999e957fb03e51f94bbeb40e67b5a237f735a0236c772a",
-                    "nonce" : "0xeccca1ded63d1b77",
-                    "number" : "0x01",
-                    "parentHash" : "0x615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eb",
-                    "receiptTrie" : "0x0d23857864339c40918576ea958635fae4485aaee193504bf10f41a542969907",
-                    "stateRoot" : "0xb695bd468ba9568791e46602d3381bd43ade7fa5259885cdff3f05388453dd75",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b695bd468ba9568791e46602d3381bd43ade7fa5259885cdff3f05388453dd75a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da00d23857864339c40918576ea958635fae4485aaee193504bf10f41a542969907b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a0a0ae65f9e53aa2546c999e957fb03e51f94bbeb40e67b5a237f735a0236c772a88eccca1ded63d1b77f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x936be9bc63557c0df30be6427cefa335f8695e4aeff6237ac190d1fd33f01c54",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0936be9bc63557c0df30be6427cefa335f8695e4aeff6237ac190d1fd33f01c54a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e3c9ad05c7ae69a988ff5f13865b81a4df3944e5e4f133fe68cdc74476a4b6e",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "98b40da5d88eb159dfc9bb080de54d5958ba9e38469f534bca370ac25fa73e03"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf13c",
-                    "hash" : "0xa776927598ac1e2940f7f2ad7b5381a873478843b93c8dafac52d5e180e0c94e",
-                    "mixHash" : "0x98a24eab48e1fd5736194f6b001f820e33ffe2654351f783eda7b5928f0f9c87",
-                    "nonce" : "0x3ccb39f021e0b400",
-                    "number" : "0x01",
-                    "parentHash" : "0x615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eb",
-                    "receiptTrie" : "0xdc5875be6b91f070a926ce915191a757acd33546654bc5969617efe742bd30ba",
-                    "stateRoot" : "0xb695bd468ba9568791e46602d3381bd43ade7fa5259885cdff3f05388453dd75",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b695bd468ba9568791e46602d3381bd43ade7fa5259885cdff3f05388453dd75a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0dc5875be6b91f070a926ce915191a757acd33546654bc5969617efe742bd30bab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a098a24eab48e1fd5736194f6b001f820e33ffe2654351f783eda7b5928f0f9c87883ccb39f021e0b400f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x936be9bc63557c0df30be6427cefa335f8695e4aeff6237ac190d1fd33f01c54",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0936be9bc63557c0df30be6427cefa335f8695e4aeff6237ac190d1fd33f01c54a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa776927598ac1e2940f7f2ad7b5381a873478843b93c8dafac52d5e180e0c94e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "98b40da5d88eb159dfc9bb080de54d5958ba9e38469f534bca370ac25fa73e03"
+            "sourceHash" : "eca824a7147e58863e20ba2c857cf333b64b937e05cbf7d65a1b0a94714cf7ac"
         },
         "blocks" : [
             {
@@ -385,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xeea8",
-                    "hash" : "0x6811089d3d68492d78951a50c3bb4242002b33d85c78efc209237603d0969a90",
-                    "mixHash" : "0xbca32ebad2f1eb7de1a0b32e2684b00a86f62eca18245fc2590aa0ef2abe4f2f",
-                    "nonce" : "0x08496e4002c54124",
+                    "hash" : "0x0bc04019fbd5c3ed39db02b8d2ff2578a81fdcda92fbfdf6388faf529e306d21",
+                    "mixHash" : "0xd4aff691745aade35f3016a13a73d72618eaa1774bcba993038425d214931035",
+                    "nonce" : "0x0cd854c0cb74a759",
                     "number" : "0x01",
                     "parentHash" : "0x615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eb",
                     "receiptTrie" : "0x49a9bf20d4f146960783f3141b0ac6a24d205735391c511dd5775e02e424e5ce",
@@ -396,10 +150,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b695bd468ba9568791e46602d3381bd43ade7fa5259885cdff3f05388453dd75a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da049a9bf20d4f146960783f3141b0ac6a24d205735391c511dd5775e02e424e5ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a0bca32ebad2f1eb7de1a0b32e2684b00a86f62eca18245fc2590aa0ef2abe4f2f8808496e4002c54124f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b695bd468ba9568791e46602d3381bd43ade7fa5259885cdff3f05388453dd75a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da049a9bf20d4f146960783f3141b0ac6a24d205735391c511dd5775e02e424e5ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a0d4aff691745aade35f3016a13a73d72618eaa1774bcba993038425d214931035880cd854c0cb74a759f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -433,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0936be9bc63557c0df30be6427cefa335f8695e4aeff6237ac190d1fd33f01c54a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6811089d3d68492d78951a50c3bb4242002b33d85c78efc209237603d0969a90",
+        "lastblockhash" : "0x0bc04019fbd5c3ed39db02b8d2ff2578a81fdcda92fbfdf6388faf529e306d21",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -490,128 +244,5 @@
                 }
             }
         }
-    },
-    "callOutput1_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "98b40da5d88eb159dfc9bb080de54d5958ba9e38469f534bca370ac25fa73e03"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xeea8",
-                    "hash" : "0xdaa84e8f6416a3b1a8bc019f432e73ef0f8ef2d7fa550d45d96d09715317d979",
-                    "mixHash" : "0x78bd746f2375a3b950686a7ef409305441a0d768ab14a73bb7102b4040c90dfe",
-                    "nonce" : "0x5f8c22923b2c548d",
-                    "number" : "0x01",
-                    "parentHash" : "0x615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eb",
-                    "receiptTrie" : "0x49a9bf20d4f146960783f3141b0ac6a24d205735391c511dd5775e02e424e5ce",
-                    "stateRoot" : "0xb695bd468ba9568791e46602d3381bd43ade7fa5259885cdff3f05388453dd75",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b695bd468ba9568791e46602d3381bd43ade7fa5259885cdff3f05388453dd75a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da049a9bf20d4f146960783f3141b0ac6a24d205735391c511dd5775e02e424e5ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a078bd746f2375a3b950686a7ef409305441a0d768ab14a73bb7102b4040c90dfe885f8c22923b2c548df865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x615efc960c7fcad59fcdcb7b80afced47d9bf82571fe6e288d901a9c88ebe0eb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x936be9bc63557c0df30be6427cefa335f8695e4aeff6237ac190d1fd33f01c54",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0936be9bc63557c0df30be6427cefa335f8695e4aeff6237ac190d1fd33f01c54a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdaa84e8f6416a3b1a8bc019f432e73ef0f8ef2d7fa550d45d96d09715317d979",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0.json
index 83b1ac93c..d63480142 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "e5022fe22b0073cbca95dccb1c2215c262eb1ab2f27b8396b6b76668b76362c7"
+            "sourceHash" : "5dab255cfcb13b227b2879e0889d3478dcc274bc1f9a44fa38689a8dc1d2aa52"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xf13c",
-                    "hash" : "0x81449609e169e011460f51b219fe9e564a1c8923303bfd24b9a1ac593695f30e",
-                    "mixHash" : "0x2f78ebe8fa74fce2bf0b5b7b1c689a4849de5cb2178059ff3096ed27387300a6",
-                    "nonce" : "0xe28819fffa43f1af",
+                    "hash" : "0xf9a06408875001e62b4cd3ab2d432cc7eb34c29c641397e9eed3b2c23e3c1b29",
+                    "mixHash" : "0x265b84d341da28b0887c61a5024297601f857eac0cd29bc651ef8fab1ed01699",
+                    "nonce" : "0x4d201d78d04a9cd2",
                     "number" : "0x01",
                     "parentHash" : "0x592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6f",
                     "receiptTrie" : "0x143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7c",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0697354aafef7a5fb8d57a6ca664499e1a7cf5b628127198aeeb44f30d3ea3cf4a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a02f78ebe8fa74fce2bf0b5b7b1c689a4849de5cb2178059ff3096ed27387300a688e28819fffa43f1aff865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0697354aafef7a5fb8d57a6ca664499e1a7cf5b628127198aeeb44f30d3ea3cf4a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a0265b84d341da28b0887c61a5024297601f857eac0cd29bc651ef8fab1ed01699884d201d78d04a9cd2f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f709084f09efd4bcded6f4c9e6ff92bc5c6df6ac52313bfb67509243a92715c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81449609e169e011460f51b219fe9e564a1c8923303bfd24b9a1ac593695f30e",
+        "lastblockhash" : "0xf9a06408875001e62b4cd3ab2d432cc7eb34c29c641397e9eed3b2c23e3c1b29",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,259 +122,13 @@
             }
         }
     },
-    "callOutput2_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "e5022fe22b0073cbca95dccb1c2215c262eb1ab2f27b8396b6b76668b76362c7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf13c",
-                    "hash" : "0x4dc6647843597d771241c2385481c04f83c6d6f0f7b020b3822f7ab943fe317f",
-                    "mixHash" : "0x1de94557759631a6b2e7f06e09c4c4d7c2c188a6040877339a93a86f5fa1f4d9",
-                    "nonce" : "0x94d48fe7005b8cab",
-                    "number" : "0x01",
-                    "parentHash" : "0x592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6f",
-                    "receiptTrie" : "0xbab57ebffa480fb9829bbae084b90e2912d690b2f9fe38fdcf96ed2b25a1f683",
-                    "stateRoot" : "0x717190509576b7f11ed50d3f328cc7fa82d74a0d618bd6bfea8ce405b72ccf52",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0717190509576b7f11ed50d3f328cc7fa82d74a0d618bd6bfea8ce405b72ccf52a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0bab57ebffa480fb9829bbae084b90e2912d690b2f9fe38fdcf96ed2b25a1f683b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a01de94557759631a6b2e7f06e09c4c4d7c2c188a6040877339a93a86f5fa1f4d98894d48fe7005b8cabf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf709084f09efd4bcded6f4c9e6ff92bc5c6df6ac52313bfb67509243a92715c4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f709084f09efd4bcded6f4c9e6ff92bc5c6df6ac52313bfb67509243a92715c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4dc6647843597d771241c2385481c04f83c6d6f0f7b020b3822f7ab943fe317f",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "e5022fe22b0073cbca95dccb1c2215c262eb1ab2f27b8396b6b76668b76362c7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf13c",
-                    "hash" : "0x7e91a1220ee426ec63c5ffe4e31b376206fa896fe077cc9e514103b0fcad8da2",
-                    "mixHash" : "0x931bdf3b770df7e2ebe9630c6f740812fc11cf33c836812797b8c283a5b5db80",
-                    "nonce" : "0xc4405c80f8f6ace8",
-                    "number" : "0x01",
-                    "parentHash" : "0x592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6f",
-                    "receiptTrie" : "0xf1e87aaea8106d3ec0e18dbbdfd07315ba6c5a76cc985d2de323ca8bcb28a339",
-                    "stateRoot" : "0x717190509576b7f11ed50d3f328cc7fa82d74a0d618bd6bfea8ce405b72ccf52",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0717190509576b7f11ed50d3f328cc7fa82d74a0d618bd6bfea8ce405b72ccf52a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f1e87aaea8106d3ec0e18dbbdfd07315ba6c5a76cc985d2de323ca8bcb28a339b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a0931bdf3b770df7e2ebe9630c6f740812fc11cf33c836812797b8c283a5b5db8088c4405c80f8f6ace8f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf709084f09efd4bcded6f4c9e6ff92bc5c6df6ac52313bfb67509243a92715c4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f709084f09efd4bcded6f4c9e6ff92bc5c6df6ac52313bfb67509243a92715c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e91a1220ee426ec63c5ffe4e31b376206fa896fe077cc9e514103b0fcad8da2",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "e5022fe22b0073cbca95dccb1c2215c262eb1ab2f27b8396b6b76668b76362c7"
+            "sourceHash" : "5dab255cfcb13b227b2879e0889d3478dcc274bc1f9a44fa38689a8dc1d2aa52"
         },
         "blocks" : [
             {
@@ -385,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xeea8",
-                    "hash" : "0x4df3bd2f0e899e3e36135788e2335a53e68842ef65acf506bd5427b3bd24b44b",
-                    "mixHash" : "0x634278c0d56d12145c98528e9a6fb50a743922606f124fab251a1ba5f6d52dfd",
-                    "nonce" : "0x792937828ac62ca3",
+                    "hash" : "0x082c911fa2bfb2e7e650b719d92bf2aadac8afa2aa32f54ad7618043175ba228",
+                    "mixHash" : "0x7d3b233e1244d7f779a6d30cf1ceffd8edd687b346a5fe96d3d0d1924727d59b",
+                    "nonce" : "0xa3c1bfedefbf006b",
                     "number" : "0x01",
                     "parentHash" : "0x592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6f",
                     "receiptTrie" : "0x89abeeb244784d332f5c12c670b2e6e9c4fa9c91dc49ddea02092e5b5dad2433",
@@ -396,10 +150,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0717190509576b7f11ed50d3f328cc7fa82d74a0d618bd6bfea8ce405b72ccf52a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da089abeeb244784d332f5c12c670b2e6e9c4fa9c91dc49ddea02092e5b5dad2433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a0634278c0d56d12145c98528e9a6fb50a743922606f124fab251a1ba5f6d52dfd88792937828ac62ca3f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0717190509576b7f11ed50d3f328cc7fa82d74a0d618bd6bfea8ce405b72ccf52a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da089abeeb244784d332f5c12c670b2e6e9c4fa9c91dc49ddea02092e5b5dad2433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a07d3b233e1244d7f779a6d30cf1ceffd8edd687b346a5fe96d3d0d1924727d59b88a3c1bfedefbf006bf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -433,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f709084f09efd4bcded6f4c9e6ff92bc5c6df6ac52313bfb67509243a92715c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4df3bd2f0e899e3e36135788e2335a53e68842ef65acf506bd5427b3bd24b44b",
+        "lastblockhash" : "0x082c911fa2bfb2e7e650b719d92bf2aadac8afa2aa32f54ad7618043175ba228",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -490,128 +244,5 @@
                 }
             }
         }
-    },
-    "callOutput2_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "e5022fe22b0073cbca95dccb1c2215c262eb1ab2f27b8396b6b76668b76362c7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xeea8",
-                    "hash" : "0x9f239c310739cbcf4ff34248a7d85a1ce730919c4b7dd19466d724c9b79de49f",
-                    "mixHash" : "0x9756db4c5b80bfd73c82b66ed8a0e41ae2287847573f858ee3552dbb0ab36aeb",
-                    "nonce" : "0xa184b0e33e759944",
-                    "number" : "0x01",
-                    "parentHash" : "0x592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6f",
-                    "receiptTrie" : "0x89abeeb244784d332f5c12c670b2e6e9c4fa9c91dc49ddea02092e5b5dad2433",
-                    "stateRoot" : "0x717190509576b7f11ed50d3f328cc7fa82d74a0d618bd6bfea8ce405b72ccf52",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0717190509576b7f11ed50d3f328cc7fa82d74a0d618bd6bfea8ce405b72ccf52a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da089abeeb244784d332f5c12c670b2e6e9c4fa9c91dc49ddea02092e5b5dad2433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a09756db4c5b80bfd73c82b66ed8a0e41ae2287847573f858ee3552dbb0ab36aeb88a184b0e33e759944f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x592333d3d40a532a5cd78dfa384c074cccc258cb124387a4e9e784546637dd6f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf709084f09efd4bcded6f4c9e6ff92bc5c6df6ac52313bfb67509243a92715c4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f709084f09efd4bcded6f4c9e6ff92bc5c6df6ac52313bfb67509243a92715c4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f239c310739cbcf4ff34248a7d85a1ce730919c4b7dd19466d724c9b79de49f",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0.json
index e337ced4b..b596156a7 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "bebf653655eaa21f278b35785eb38180c8c40b59df1898f191f6b71d19b2dfef"
+            "sourceHash" : "95a714406b5545018faf43047dc5c28d30832c860c8cd93ccc632f6a36475378"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016660",
-                    "hash" : "0x92ed3c5a8f3d8e1ba16c0feca7052837c9c7b871ea8270ad0ac0a6dfbdbbb476",
-                    "mixHash" : "0xd3e1c73f32b5638d498681c2ac4242611d09082cbf789cc3acf828f4f221a906",
-                    "nonce" : "0x0d050f68192ea516",
+                    "hash" : "0x18e762ea725d785a5a7b5441d1c2e0cdeb48bda3e06efba753096b208e96239d",
+                    "mixHash" : "0x1549327988c055024446e24ae08f49c138c89500a25f9247988d867cb750c754",
+                    "nonce" : "0x5d502b101ca90a66",
                     "number" : "0x01",
                     "parentHash" : "0xb7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888a",
                     "receiptTrie" : "0x11a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0685bf9e82202d0283049613acc061c5dd60a19fad9ba419af82e2b155095ad6ea07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a0d3e1c73f32b5638d498681c2ac4242611d09082cbf789cc3acf828f4f221a906880d050f68192ea516f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90263f901f8a0b7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0685bf9e82202d0283049613acc061c5dd60a19fad9ba419af82e2b155095ad6ea07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a01549327988c055024446e24ae08f49c138c89500a25f9247988d867cb750c754885d502b101ca90a66f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dc2d970bbce332b1e2e4b50a8c95ee703a38ad61ffe7a3e49bfc9a38fdf970ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92ed3c5a8f3d8e1ba16c0feca7052837c9c7b871ea8270ad0ac0a6dfbdbbb476",
+        "lastblockhash" : "0x18e762ea725d785a5a7b5441d1c2e0cdeb48bda3e06efba753096b208e96239d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callOutput3Fail_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "bebf653655eaa21f278b35785eb38180c8c40b59df1898f191f6b71d19b2dfef"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016660",
-                    "hash" : "0x70e614dcca901e9fe92113708f393bda059792800c33eec2ac7574e879e706ab",
-                    "mixHash" : "0xb3b74462073550dedd55369507ef149a33492fbb96bc36ea3483c8c782558405",
-                    "nonce" : "0x75d221b324e252d8",
-                    "number" : "0x01",
-                    "parentHash" : "0xb7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888a",
-                    "receiptTrie" : "0xed7d5cc9b455b659780a5692e3bdef1368f8658b45934bec17527da69a51e96e",
-                    "stateRoot" : "0x0933c7ae0b920d398c60e3016e818e9337ff751da294d5ecb5ef1b3a0538f984",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0b7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00933c7ae0b920d398c60e3016e818e9337ff751da294d5ecb5ef1b3a0538f984a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0ed7d5cc9b455b659780a5692e3bdef1368f8658b45934bec17527da69a51e96eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a0b3b74462073550dedd55369507ef149a33492fbb96bc36ea3483c8c7825584058875d221b324e252d8f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xb7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6dc2d970bbce332b1e2e4b50a8c95ee703a38ad61ffe7a3e49bfc9a38fdf970e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dc2d970bbce332b1e2e4b50a8c95ee703a38ad61ffe7a3e49bfc9a38fdf970ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70e614dcca901e9fe92113708f393bda059792800c33eec2ac7574e879e706ab",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "bebf653655eaa21f278b35785eb38180c8c40b59df1898f191f6b71d19b2dfef"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016660",
-                    "hash" : "0xc13b290c3dd664ccd1df50db33bec0240506661187b1e35223b217301d92c9f1",
-                    "mixHash" : "0xefb56fe9aaa90e323b61f6079b37d3f37e82790fa0ffd70704e571dc17533096",
-                    "nonce" : "0xddfca4411da9c212",
-                    "number" : "0x01",
-                    "parentHash" : "0xb7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888a",
-                    "receiptTrie" : "0x6757c1e66b94ade491744b13e1182ae0234ad6e0338704491acb86fedec1cebb",
-                    "stateRoot" : "0x0933c7ae0b920d398c60e3016e818e9337ff751da294d5ecb5ef1b3a0538f984",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0b7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00933c7ae0b920d398c60e3016e818e9337ff751da294d5ecb5ef1b3a0538f984a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da06757c1e66b94ade491744b13e1182ae0234ad6e0338704491acb86fedec1cebbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a0efb56fe9aaa90e323b61f6079b37d3f37e82790fa0ffd70704e571dc1753309688ddfca4411da9c212f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xb7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6dc2d970bbce332b1e2e4b50a8c95ee703a38ad61ffe7a3e49bfc9a38fdf970e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dc2d970bbce332b1e2e4b50a8c95ee703a38ad61ffe7a3e49bfc9a38fdf970ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc13b290c3dd664ccd1df50db33bec0240506661187b1e35223b217301d92c9f1",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3Fail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "bebf653655eaa21f278b35785eb38180c8c40b59df1898f191f6b71d19b2dfef"
+            "sourceHash" : "95a714406b5545018faf43047dc5c28d30832c860c8cd93ccc632f6a36475378"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163cc",
-                    "hash" : "0x769df0373c237960598f33bf7954a8b6330de7f6590fe56de2ebbb1deff50bba",
-                    "mixHash" : "0x3a3174e396e55b50fe9739a77d8b00a6864a5ea3f2a590178f9e09d8c1cce679",
-                    "nonce" : "0xd6f0ba90476b42cc",
+                    "hash" : "0xbc9bd443c0ec15891ea4b1ada10e80568a0772386419a992867e7086143409f6",
+                    "mixHash" : "0xd74662463fb9c2f337f8218e4233d0ebee012e3e25722b9b975b8e1a4cde6ee8",
+                    "nonce" : "0x3b0e1af7b8e82269",
                     "number" : "0x01",
                     "parentHash" : "0xb7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888a",
                     "receiptTrie" : "0x9011b30c91446148f7f0c5034c91947cb8f0ae50c2e25929ff332ceec2bab5d8",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0b7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00933c7ae0b920d398c60e3016e818e9337ff751da294d5ecb5ef1b3a0538f984a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da09011b30c91446148f7f0c5034c91947cb8f0ae50c2e25929ff332ceec2bab5d8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a03a3174e396e55b50fe9739a77d8b00a6864a5ea3f2a590178f9e09d8c1cce67988d6f0ba90476b42ccf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90263f901f8a0b7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00933c7ae0b920d398c60e3016e818e9337ff751da294d5ecb5ef1b3a0538f984a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da09011b30c91446148f7f0c5034c91947cb8f0ae50c2e25929ff332ceec2bab5d8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a0d74662463fb9c2f337f8218e4233d0ebee012e3e25722b9b975b8e1a4cde6ee8883b0e1af7b8e82269f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dc2d970bbce332b1e2e4b50a8c95ee703a38ad61ffe7a3e49bfc9a38fdf970ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x769df0373c237960598f33bf7954a8b6330de7f6590fe56de2ebbb1deff50bba",
+        "lastblockhash" : "0xbc9bd443c0ec15891ea4b1ada10e80568a0772386419a992867e7086143409f6",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callOutput3Fail_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "bebf653655eaa21f278b35785eb38180c8c40b59df1898f191f6b71d19b2dfef"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0163cc",
-                    "hash" : "0x7886c2dc050dd930724cadd0f541cfa723cce4a717c364d23c8d298933a2dd25",
-                    "mixHash" : "0x59b562a02c8dbc6331b7cbb711d5ae843761aacbcb97ebb717558ddf4163b70b",
-                    "nonce" : "0xbed91c758831e7ef",
-                    "number" : "0x01",
-                    "parentHash" : "0xb7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888a",
-                    "receiptTrie" : "0x9011b30c91446148f7f0c5034c91947cb8f0ae50c2e25929ff332ceec2bab5d8",
-                    "stateRoot" : "0x0933c7ae0b920d398c60e3016e818e9337ff751da294d5ecb5ef1b3a0538f984",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0b7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00933c7ae0b920d398c60e3016e818e9337ff751da294d5ecb5ef1b3a0538f984a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da09011b30c91446148f7f0c5034c91947cb8f0ae50c2e25929ff332ceec2bab5d8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a059b562a02c8dbc6331b7cbb711d5ae843761aacbcb97ebb717558ddf4163b70b88bed91c758831e7eff865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xb7ce08dac6ee4deeba93d1d947c174116cd178e18acf5e9e3dfa503c9eac888a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6dc2d970bbce332b1e2e4b50a8c95ee703a38ad61ffe7a3e49bfc9a38fdf970e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dc2d970bbce332b1e2e4b50a8c95ee703a38ad61ffe7a3e49bfc9a38fdf970ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7886c2dc050dd930724cadd0f541cfa723cce4a717c364d23c8d298933a2dd25",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0.json
index 493cfc33c..0c8d90afa 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "79d704548426a72fd3cd17bca151fb81abd690a9f40d05d4ce127a64a9d56d5d"
+            "sourceHash" : "2e55cb0c28711598dfd76e0c203485c28ff6343a868c8fab2dfdff6da84d33ad"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xf13c",
-                    "hash" : "0x387c99a4daccb9a6f616c3fba3e66e4238d68b93c4eb8ad6b2dfa8bc9e1ce12b",
-                    "mixHash" : "0x8ec26c2e834c0cac3a8bd9fd31004b5afe2aaa760055c03ec4c67757a329c975",
-                    "nonce" : "0xb2fb84a864c4ed94",
+                    "hash" : "0xaf454cb6dff918d32961cf44dbc4b4aee73029870b5d3f1960f4ab356e723ebd",
+                    "mixHash" : "0xfebadad0453cb4bb38c5136f7800d1f31bcfe375a2a63142197fc43a37da5c54",
+                    "nonce" : "0xf8114b9c3a47cae0",
                     "number" : "0x01",
                     "parentHash" : "0xa6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5",
                     "receiptTrie" : "0x143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7c",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0a6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c42bea8a36bcbf69d96b1c3cb14f3e88fb56b3382e3b63bd6dc11b19526c55e5a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a08ec26c2e834c0cac3a8bd9fd31004b5afe2aaa760055c03ec4c67757a329c97588b2fb84a864c4ed94f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0a6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c42bea8a36bcbf69d96b1c3cb14f3e88fb56b3382e3b63bd6dc11b19526c55e5a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a0febadad0453cb4bb38c5136f7800d1f31bcfe375a2a63142197fc43a37da5c5488f8114b9c3a47cae0f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c82be0372e646c95db9172a37bcf24e623464e083a829b61ee9483be239fdf6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x387c99a4daccb9a6f616c3fba3e66e4238d68b93c4eb8ad6b2dfa8bc9e1ce12b",
+        "lastblockhash" : "0xaf454cb6dff918d32961cf44dbc4b4aee73029870b5d3f1960f4ab356e723ebd",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,259 +122,13 @@
             }
         }
     },
-    "callOutput3_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "79d704548426a72fd3cd17bca151fb81abd690a9f40d05d4ce127a64a9d56d5d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf13c",
-                    "hash" : "0xb1da288c26e1a9947c1895b9962c02954b420b443e247afad931a4e2e52c5026",
-                    "mixHash" : "0x10008faadf3a2a033db74c4d3f6c25d388ce8f3cc4d70a767272cf2f74fad54f",
-                    "nonce" : "0x1b69e0e871e860aa",
-                    "number" : "0x01",
-                    "parentHash" : "0xa6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5",
-                    "receiptTrie" : "0xbfa0451dcaa2aaa0cd3afb76843d608f1363d50194e8054010a36a15002895ed",
-                    "stateRoot" : "0xd5e47a8aa652f84fb7fe46166396fe8486fa90875946bb6195bfe4543c68ef4b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0a6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5e47a8aa652f84fb7fe46166396fe8486fa90875946bb6195bfe4543c68ef4ba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0bfa0451dcaa2aaa0cd3afb76843d608f1363d50194e8054010a36a15002895edb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a010008faadf3a2a033db74c4d3f6c25d388ce8f3cc4d70a767272cf2f74fad54f881b69e0e871e860aaf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xa6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9c82be0372e646c95db9172a37bcf24e623464e083a829b61ee9483be239fdf6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c82be0372e646c95db9172a37bcf24e623464e083a829b61ee9483be239fdf6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1da288c26e1a9947c1895b9962c02954b420b443e247afad931a4e2e52c5026",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "79d704548426a72fd3cd17bca151fb81abd690a9f40d05d4ce127a64a9d56d5d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf13c",
-                    "hash" : "0x89901a4d77bcea8f1100bdb7439acc4072c078c4f5e7883fab720c9b0fd253e9",
-                    "mixHash" : "0x81183737a54b712ddea512a130c53361da87b135832a96138e5078f7b87cd58d",
-                    "nonce" : "0x0860ed4f33f1c8ab",
-                    "number" : "0x01",
-                    "parentHash" : "0xa6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5",
-                    "receiptTrie" : "0x7169d1260ac9dc5c2ccf0688da8d13a31812ab2c5f7b75c9335a3a3d7ad68409",
-                    "stateRoot" : "0xd5e47a8aa652f84fb7fe46166396fe8486fa90875946bb6195bfe4543c68ef4b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0a6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5e47a8aa652f84fb7fe46166396fe8486fa90875946bb6195bfe4543c68ef4ba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da07169d1260ac9dc5c2ccf0688da8d13a31812ab2c5f7b75c9335a3a3d7ad68409b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a081183737a54b712ddea512a130c53361da87b135832a96138e5078f7b87cd58d880860ed4f33f1c8abf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xa6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9c82be0372e646c95db9172a37bcf24e623464e083a829b61ee9483be239fdf6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c82be0372e646c95db9172a37bcf24e623464e083a829b61ee9483be239fdf6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89901a4d77bcea8f1100bdb7439acc4072c078c4f5e7883fab720c9b0fd253e9",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "79d704548426a72fd3cd17bca151fb81abd690a9f40d05d4ce127a64a9d56d5d"
+            "sourceHash" : "2e55cb0c28711598dfd76e0c203485c28ff6343a868c8fab2dfdff6da84d33ad"
         },
         "blocks" : [
             {
@@ -385,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xeea8",
-                    "hash" : "0x8ccc99a9b375b7293af92ec4bb13b574c36f363225c31092ae11ebc4ac82fd31",
-                    "mixHash" : "0xf1985bf3b2b6960674990c811a600cf8cb407b3f3cff137274ceda63ff9e7f13",
-                    "nonce" : "0x7e771e0fdf2fbb7a",
+                    "hash" : "0x8f9d1b47acd586257cb89f6a8f4b1bd616e9d0f1c246dc1792d1f0254b115a41",
+                    "mixHash" : "0xfa031a8f3a998770fc44c822a3aaca5acc7fecbd59bad2318444968025c9b94c",
+                    "nonce" : "0xbfc03b08da3526de",
                     "number" : "0x01",
                     "parentHash" : "0xa6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5",
                     "receiptTrie" : "0x11b4a0c4e5d3819def5489b56106626ab7d0d4afc6b66a2e5f62032e1abce928",
@@ -396,10 +150,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0a6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5e47a8aa652f84fb7fe46166396fe8486fa90875946bb6195bfe4543c68ef4ba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011b4a0c4e5d3819def5489b56106626ab7d0d4afc6b66a2e5f62032e1abce928b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a0f1985bf3b2b6960674990c811a600cf8cb407b3f3cff137274ceda63ff9e7f13887e771e0fdf2fbb7af865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0a6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5e47a8aa652f84fb7fe46166396fe8486fa90875946bb6195bfe4543c68ef4ba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011b4a0c4e5d3819def5489b56106626ab7d0d4afc6b66a2e5f62032e1abce928b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a0fa031a8f3a998770fc44c822a3aaca5acc7fecbd59bad2318444968025c9b94c88bfc03b08da3526def865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -433,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c82be0372e646c95db9172a37bcf24e623464e083a829b61ee9483be239fdf6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ccc99a9b375b7293af92ec4bb13b574c36f363225c31092ae11ebc4ac82fd31",
+        "lastblockhash" : "0x8f9d1b47acd586257cb89f6a8f4b1bd616e9d0f1c246dc1792d1f0254b115a41",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -490,128 +244,5 @@
                 }
             }
         }
-    },
-    "callOutput3_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "79d704548426a72fd3cd17bca151fb81abd690a9f40d05d4ce127a64a9d56d5d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xeea8",
-                    "hash" : "0x22db25a2e19df2da7c1ffda6ff8dc962dda125cf7298791c5832ad22c62fc5c0",
-                    "mixHash" : "0x4b3da71cbedd0cd591d475cec23cdffd1bdb3daf770008b67b13707be8bef442",
-                    "nonce" : "0x9593cbfaf7abd2a4",
-                    "number" : "0x01",
-                    "parentHash" : "0xa6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5",
-                    "receiptTrie" : "0x11b4a0c4e5d3819def5489b56106626ab7d0d4afc6b66a2e5f62032e1abce928",
-                    "stateRoot" : "0xd5e47a8aa652f84fb7fe46166396fe8486fa90875946bb6195bfe4543c68ef4b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0a6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5e47a8aa652f84fb7fe46166396fe8486fa90875946bb6195bfe4543c68ef4ba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011b4a0c4e5d3819def5489b56106626ab7d0d4afc6b66a2e5f62032e1abce928b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a04b3da71cbedd0cd591d475cec23cdffd1bdb3daf770008b67b13707be8bef442889593cbfaf7abd2a4f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xa6337bd947a7b961301e24dd78e5886dd1af3ac6603641bbf231ce594bcb5ea5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9c82be0372e646c95db9172a37bcf24e623464e083a829b61ee9483be239fdf6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c82be0372e646c95db9172a37bcf24e623464e083a829b61ee9483be239fdf6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22db25a2e19df2da7c1ffda6ff8dc962dda125cf7298791c5832ad22c62fc5c0",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0.json
index cfbd92638..086ee14f1 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "4bead5579e207d6ebd2b31178c2190a17a25f0fac6336bc0f9a69e7a3416f19b"
+            "sourceHash" : "89abce88c180b0d47ba318cf3c8453ae2b706d0b3a0b0d6435c85393e46ff442"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016660",
-                    "hash" : "0x8d5e5f03c47562bca7c4c8d05bd1d21fabb04c7ad9c535e1e9a009d2ff7b4f80",
-                    "mixHash" : "0x17fa79edfc14e4c0adcf22120c0b8d8f4d67262f2b47c6440aa9cf65bc911c3f",
-                    "nonce" : "0x591106ed4126593d",
+                    "hash" : "0x326066fb36b069c50ea5a006d31bd186a0d3cc0decd80829ab9c100fc03aa65d",
+                    "mixHash" : "0x73da5124d16c66b37b6a12dc25c502cb1968344323da2d6acf3326dca277f87e",
+                    "nonce" : "0x5bfa8bccab0d32f2",
                     "number" : "0x01",
                     "parentHash" : "0x6cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96",
                     "receiptTrie" : "0x11a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0018f2b5b96d20dadfdf6fdbc1571dd2686efd7e50d42e6c50634924a79128735a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a017fa79edfc14e4c0adcf22120c0b8d8f4d67262f2b47c6440aa9cf65bc911c3f88591106ed4126593df865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90263f901f8a06cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0018f2b5b96d20dadfdf6fdbc1571dd2686efd7e50d42e6c50634924a79128735a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a073da5124d16c66b37b6a12dc25c502cb1968344323da2d6acf3326dca277f87e885bfa8bccab0d32f2f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef1d54edd560b77002cf1dd03585b7d3789aa30ff2d8a39b8da812542e8d4764a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d5e5f03c47562bca7c4c8d05bd1d21fabb04c7ad9c535e1e9a009d2ff7b4f80",
+        "lastblockhash" : "0x326066fb36b069c50ea5a006d31bd186a0d3cc0decd80829ab9c100fc03aa65d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callOutput3partialFail_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "4bead5579e207d6ebd2b31178c2190a17a25f0fac6336bc0f9a69e7a3416f19b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016660",
-                    "hash" : "0x61669251aa8cca6346fdc9a9d89389bbe9eace3298a0f3c605e728d575ebc2dc",
-                    "mixHash" : "0xa8a2f2477fac5999280745e73e9df4216b451ea0b44c45cf5742fd63bdbfcb67",
-                    "nonce" : "0xe4e984b3daea907d",
-                    "number" : "0x01",
-                    "parentHash" : "0x6cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96",
-                    "receiptTrie" : "0x6837f41aa910e9dcd83dad671bd8f3eda3d1b506bfaa5d00d24566e4822091f5",
-                    "stateRoot" : "0xc8f320018c983c5a1da8169196708e157eaa0314363dcb625029d52de46fb544",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f320018c983c5a1da8169196708e157eaa0314363dcb625029d52de46fb544a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da06837f41aa910e9dcd83dad671bd8f3eda3d1b506bfaa5d00d24566e4822091f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a0a8a2f2477fac5999280745e73e9df4216b451ea0b44c45cf5742fd63bdbfcb6788e4e984b3daea907df865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xef1d54edd560b77002cf1dd03585b7d3789aa30ff2d8a39b8da812542e8d4764",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef1d54edd560b77002cf1dd03585b7d3789aa30ff2d8a39b8da812542e8d4764a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61669251aa8cca6346fdc9a9d89389bbe9eace3298a0f3c605e728d575ebc2dc",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "4bead5579e207d6ebd2b31178c2190a17a25f0fac6336bc0f9a69e7a3416f19b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016660",
-                    "hash" : "0x7a2d9da30fd974ce3a7e861917e602a88dd136de983855beb8b8142e03bc4df3",
-                    "mixHash" : "0x33c760a335cc84f976f185425cddc64d6a405977c461c40f92064f808cd9c659",
-                    "nonce" : "0x7fc77ee0a91e80a0",
-                    "number" : "0x01",
-                    "parentHash" : "0x6cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96",
-                    "receiptTrie" : "0xe2c7f43029dec4f89a6abaebb5812d9b58f80acde9110e40b314e467a94ac3b3",
-                    "stateRoot" : "0xc8f320018c983c5a1da8169196708e157eaa0314363dcb625029d52de46fb544",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f320018c983c5a1da8169196708e157eaa0314363dcb625029d52de46fb544a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0e2c7f43029dec4f89a6abaebb5812d9b58f80acde9110e40b314e467a94ac3b3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a033c760a335cc84f976f185425cddc64d6a405977c461c40f92064f808cd9c659887fc77ee0a91e80a0f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xef1d54edd560b77002cf1dd03585b7d3789aa30ff2d8a39b8da812542e8d4764",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef1d54edd560b77002cf1dd03585b7d3789aa30ff2d8a39b8da812542e8d4764a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a2d9da30fd974ce3a7e861917e602a88dd136de983855beb8b8142e03bc4df3",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3partialFail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "4bead5579e207d6ebd2b31178c2190a17a25f0fac6336bc0f9a69e7a3416f19b"
+            "sourceHash" : "89abce88c180b0d47ba318cf3c8453ae2b706d0b3a0b0d6435c85393e46ff442"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163cc",
-                    "hash" : "0x16bc678b257c3410501cb4d1a429832963146ec74cd887e56db6748d62f4f552",
-                    "mixHash" : "0xc470e9960dc8744dda12d2a6b73558a8eb757080aad81382f35bd3825467f88c",
-                    "nonce" : "0x7fae495c843636b4",
+                    "hash" : "0x16dade1917114da054ad99bfc4d0c824bde7e2fd33e17674bac4a21bb69db310",
+                    "mixHash" : "0x4ec6039ee7c0210416f8541f066418b248c4a60073de3084e258c2c7910c0b2c",
+                    "nonce" : "0x0c9a7a7c246a59da",
                     "number" : "0x01",
                     "parentHash" : "0x6cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96",
                     "receiptTrie" : "0xf83d094d64edeb48aefe36558f35a0d87540db4274e584609973a6985b753beb",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f320018c983c5a1da8169196708e157eaa0314363dcb625029d52de46fb544a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f83d094d64edeb48aefe36558f35a0d87540db4274e584609973a6985b753bebb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a0c470e9960dc8744dda12d2a6b73558a8eb757080aad81382f35bd3825467f88c887fae495c843636b4f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90263f901f8a06cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f320018c983c5a1da8169196708e157eaa0314363dcb625029d52de46fb544a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f83d094d64edeb48aefe36558f35a0d87540db4274e584609973a6985b753bebb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a04ec6039ee7c0210416f8541f066418b248c4a60073de3084e258c2c7910c0b2c880c9a7a7c246a59daf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef1d54edd560b77002cf1dd03585b7d3789aa30ff2d8a39b8da812542e8d4764a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16bc678b257c3410501cb4d1a429832963146ec74cd887e56db6748d62f4f552",
+        "lastblockhash" : "0x16dade1917114da054ad99bfc4d0c824bde7e2fd33e17674bac4a21bb69db310",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callOutput3partialFail_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "4bead5579e207d6ebd2b31178c2190a17a25f0fac6336bc0f9a69e7a3416f19b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0163cc",
-                    "hash" : "0x1109692a85b0f84a28e1750e634fa0f5649bcccf532bde936d142c20af3637ef",
-                    "mixHash" : "0xeccb6f25033af9967c7bb4235f50b064121fdfaaae8ce1ef066a7cc44f4545d7",
-                    "nonce" : "0x9b24e64c2ea369a1",
-                    "number" : "0x01",
-                    "parentHash" : "0x6cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96",
-                    "receiptTrie" : "0xf83d094d64edeb48aefe36558f35a0d87540db4274e584609973a6985b753beb",
-                    "stateRoot" : "0xc8f320018c983c5a1da8169196708e157eaa0314363dcb625029d52de46fb544",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f320018c983c5a1da8169196708e157eaa0314363dcb625029d52de46fb544a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f83d094d64edeb48aefe36558f35a0d87540db4274e584609973a6985b753bebb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a0eccb6f25033af9967c7bb4235f50b064121fdfaaae8ce1ef066a7cc44f4545d7889b24e64c2ea369a1f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6cfcefd85e0e409dd4c8e6b2440e8d35c84f5e5b9d0215b8f7a92345bf013c96",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xef1d54edd560b77002cf1dd03585b7d3789aa30ff2d8a39b8da812542e8d4764",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef1d54edd560b77002cf1dd03585b7d3789aa30ff2d8a39b8da812542e8d4764a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1109692a85b0f84a28e1750e634fa0f5649bcccf532bde936d142c20af3637ef",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0.json
index befe50a4c..504954a81 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "7d8df19cc9d4e716baaee479382043377d691f602447d4c2f565e7a6fd7adf50"
+            "sourceHash" : "ce76c98d50b7a6f5fc71c19a9871a98c05076fc67da566620e46b87543dd70e2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xf13c",
-                    "hash" : "0x2ce4e341fb77e4b185b60458943fb26e06ee2ba241605652f631634d0c7c39eb",
-                    "mixHash" : "0xaa2fc5f4469d7050d77e0b92c1f526d1adbc6f6ccbe49ad7b6e707034322541c",
-                    "nonce" : "0x680865be1c20cbfd",
+                    "hash" : "0xb08caee8a0352fee8b7d63c14970deb915bf2883f4a59d1c68551085a64728e6",
+                    "mixHash" : "0xcd07fa07534220dcb07032837585099a06fcd51434bcfcf77db957073791f5e8",
+                    "nonce" : "0xb8809860655b7545",
                     "number" : "0x01",
                     "parentHash" : "0x0c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31fa",
                     "receiptTrie" : "0x143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7c",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31faa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054f20d3dbae9e00dd7c4f5b5957c3a7fdfb2353b6783aa0453c099e9683bfb4da07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a0aa2fc5f4469d7050d77e0b92c1f526d1adbc6f6ccbe49ad7b6e707034322541c88680865be1c20cbfdf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a00c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31faa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054f20d3dbae9e00dd7c4f5b5957c3a7fdfb2353b6783aa0453c099e9683bfb4da07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0143c91f4bf6e97def5e94de631eb2dd8f8543c693923c19abd5f763190d95b7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a0cd07fa07534220dcb07032837585099a06fcd51434bcfcf77db957073791f5e888b8809860655b7545f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0004b6eec7dc45aaba2e4c546d46e3e8e9c5c1b9de31d73885c851d6c41a4edb2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ce4e341fb77e4b185b60458943fb26e06ee2ba241605652f631634d0c7c39eb",
+        "lastblockhash" : "0xb08caee8a0352fee8b7d63c14970deb915bf2883f4a59d1c68551085a64728e6",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,259 +122,13 @@
             }
         }
     },
-    "callOutput3partial_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "7d8df19cc9d4e716baaee479382043377d691f602447d4c2f565e7a6fd7adf50"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf13c",
-                    "hash" : "0x035cccc88307f322599501481de61f866c55c897059409e7373ec0175afef580",
-                    "mixHash" : "0x3175ddc8563250bab4a96b848a256bb30be9890e3ca6a42cf58586db527bfb3a",
-                    "nonce" : "0x680c3776945224e0",
-                    "number" : "0x01",
-                    "parentHash" : "0x0c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31fa",
-                    "receiptTrie" : "0x2e086b15eeeeda9343f91fb92c7506d29a848eecc412e39366a91073554cb7d6",
-                    "stateRoot" : "0xd77136f383fab45a806a5029933433056e84a1ff190e07fedc6fa3cf3c2b1487",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a00c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31faa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d77136f383fab45a806a5029933433056e84a1ff190e07fedc6fa3cf3c2b1487a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da02e086b15eeeeda9343f91fb92c7506d29a848eecc412e39366a91073554cb7d6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a03175ddc8563250bab4a96b848a256bb30be9890e3ca6a42cf58586db527bfb3a88680c3776945224e0f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x0c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31fa",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x004b6eec7dc45aaba2e4c546d46e3e8e9c5c1b9de31d73885c851d6c41a4edb2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0004b6eec7dc45aaba2e4c546d46e3e8e9c5c1b9de31d73885c851d6c41a4edb2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x035cccc88307f322599501481de61f866c55c897059409e7373ec0175afef580",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "7d8df19cc9d4e716baaee479382043377d691f602447d4c2f565e7a6fd7adf50"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf13c",
-                    "hash" : "0xc2e391a682b65ace4d9d76b148a199ad0fd8b7aeb9e27984e0bed8680f385856",
-                    "mixHash" : "0xa29d85143bef46678bd364dae6472f60af0c443a949fa656e419a21bdb85c54d",
-                    "nonce" : "0xa8a391c6bf99862c",
-                    "number" : "0x01",
-                    "parentHash" : "0x0c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31fa",
-                    "receiptTrie" : "0x304913ebb690e75f791e3189ab67abfd934035ba1bcd01a56918b0ae76aee45c",
-                    "stateRoot" : "0xd77136f383fab45a806a5029933433056e84a1ff190e07fedc6fa3cf3c2b1487",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a00c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31faa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d77136f383fab45a806a5029933433056e84a1ff190e07fedc6fa3cf3c2b1487a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0304913ebb690e75f791e3189ab67abfd934035ba1bcd01a56918b0ae76aee45cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f13c8203e880a0a29d85143bef46678bd364dae6472f60af0c443a949fa656e419a21bdb85c54d88a8a391c6bf99862cf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x0c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31fa",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x004b6eec7dc45aaba2e4c546d46e3e8e9c5c1b9de31d73885c851d6c41a4edb2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0004b6eec7dc45aaba2e4c546d46e3e8e9c5c1b9de31d73885c851d6c41a4edb2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2e391a682b65ace4d9d76b148a199ad0fd8b7aeb9e27984e0bed8680f385856",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3partial_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "7d8df19cc9d4e716baaee479382043377d691f602447d4c2f565e7a6fd7adf50"
+            "sourceHash" : "ce76c98d50b7a6f5fc71c19a9871a98c05076fc67da566620e46b87543dd70e2"
         },
         "blocks" : [
             {
@@ -385,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xeea8",
-                    "hash" : "0xbaf1e573c033bf3ff8949c280803bc1ea78cf57d0e7f5f56f7c03075110efe66",
-                    "mixHash" : "0x8db9e3f2787f027c4467b876ff49cf65cb7fc34d04bd04daaf4916d0918ce11c",
-                    "nonce" : "0xcb3b9963fe7c0dc2",
+                    "hash" : "0xfc8a387c2ee75470445bbe4ff9a96194875f68aabf6f967e66a76beb220c3ca8",
+                    "mixHash" : "0x31a65a159b31cb1baea68ac08a20032c80c089f60070b9a5eb0274c25f50b757",
+                    "nonce" : "0x5b67fcd0d075b62f",
                     "number" : "0x01",
                     "parentHash" : "0x0c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31fa",
                     "receiptTrie" : "0x984ca971fb26b32fc07cf794fbfb43ddf3c39a1c7fb7b12245bddc3819dc5ddc",
@@ -396,10 +150,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31faa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d77136f383fab45a806a5029933433056e84a1ff190e07fedc6fa3cf3c2b1487a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0984ca971fb26b32fc07cf794fbfb43ddf3c39a1c7fb7b12245bddc3819dc5ddcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a08db9e3f2787f027c4467b876ff49cf65cb7fc34d04bd04daaf4916d0918ce11c88cb3b9963fe7c0dc2f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a00c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31faa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d77136f383fab45a806a5029933433056e84a1ff190e07fedc6fa3cf3c2b1487a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0984ca971fb26b32fc07cf794fbfb43ddf3c39a1c7fb7b12245bddc3819dc5ddcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a031a65a159b31cb1baea68ac08a20032c80c089f60070b9a5eb0274c25f50b757885b67fcd0d075b62ff865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -433,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0004b6eec7dc45aaba2e4c546d46e3e8e9c5c1b9de31d73885c851d6c41a4edb2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbaf1e573c033bf3ff8949c280803bc1ea78cf57d0e7f5f56f7c03075110efe66",
+        "lastblockhash" : "0xfc8a387c2ee75470445bbe4ff9a96194875f68aabf6f967e66a76beb220c3ca8",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -490,128 +244,5 @@
                 }
             }
         }
-    },
-    "callOutput3partial_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "7d8df19cc9d4e716baaee479382043377d691f602447d4c2f565e7a6fd7adf50"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xeea8",
-                    "hash" : "0xdada2378ecd04bc0202f9a9203bb193b5ae743709023e93a7a31269e2f73e017",
-                    "mixHash" : "0xe960ebc1305db9622fb91bef2afab42aab6415b39b6f59ef2a63a23afeaaddb4",
-                    "nonce" : "0xaa2884b6043849c7",
-                    "number" : "0x01",
-                    "parentHash" : "0x0c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31fa",
-                    "receiptTrie" : "0x984ca971fb26b32fc07cf794fbfb43ddf3c39a1c7fb7b12245bddc3819dc5ddc",
-                    "stateRoot" : "0xd77136f383fab45a806a5029933433056e84a1ff190e07fedc6fa3cf3c2b1487",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a00c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31faa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d77136f383fab45a806a5029933433056e84a1ff190e07fedc6fa3cf3c2b1487a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0984ca971fb26b32fc07cf794fbfb43ddf3c39a1c7fb7b12245bddc3819dc5ddcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082eea88203e880a0e960ebc1305db9622fb91bef2afab42aab6415b39b6f59ef2a63a23afeaaddb488aa2884b6043849c7f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x0c82c34ba7a5573906b7900c1556a80dcc05487bad1acfc60ac0b170b21b31fa",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x004b6eec7dc45aaba2e4c546d46e3e8e9c5c1b9de31d73885c851d6c41a4edb2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0004b6eec7dc45aaba2e4c546d46e3e8e9c5c1b9de31d73885c851d6c41a4edb2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdada2378ecd04bc0202f9a9203bb193b5ae743709023e93a7a31269e2f73e017",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f150600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0.json
index 936956239..6543e66b6 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "8302e88248d418ce95852ab9cce269ed6a847f5143d94d0e1da84b1edac40028"
+            "sourceHash" : "d2ec71a8af84163c7b09ec847c2a85c0fa91646ed5fc43f9ec9097350dc8ea41"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x82a8",
-                    "hash" : "0x5944d9ec732c159bbf2fa8a0a10cfe6d5c12b997cf4b9d6363cd1ec715034d17",
-                    "mixHash" : "0x7845db8975852a0bf9e5a116efeb139ebf8738c8b55b7966b53f55d675db7a80",
-                    "nonce" : "0xd2f4f3f2d73ce57f",
+                    "hash" : "0x6b16723c587fbe2237eeba1844b48b4ef70577438154a54fd30b3fc9de4f9310",
+                    "mixHash" : "0xee66f46f3a000f058a1ad621b514bab11607d71cab67213a912cc40dc2a98b7f",
+                    "nonce" : "0x72d36ff5a8e19d8c",
                     "number" : "0x01",
                     "parentHash" : "0xa330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2f",
                     "receiptTrie" : "0x3fd5f8f60ddb1df4119a511223bc7c9bb9e1ddb36488791c073a4d960e29c92d",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0a330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab06b59c65386bba21b349fe2a6bc19da86100d97c2d7793a15b4ad5fee75787a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da03fd5f8f60ddb1df4119a511223bc7c9bb9e1ddb36488791c073a4d960e29c92db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282a88203e880a07845db8975852a0bf9e5a116efeb139ebf8738c8b55b7966b53f55d675db7a8088d2f4f3f2d73ce57ff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0a330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab06b59c65386bba21b349fe2a6bc19da86100d97c2d7793a15b4ad5fee75787a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da03fd5f8f60ddb1df4119a511223bc7c9bb9e1ddb36488791c073a4d960e29c92db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282a88203e880a0ee66f46f3a000f058a1ad621b514bab11607d71cab67213a912cc40dc2a98b7f8872d36ff5a8e19d8cf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a31f42edb107658c8b21015bd9360c57020163034d7ccec189b908b0fa59ba2da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5944d9ec732c159bbf2fa8a0a10cfe6d5c12b997cf4b9d6363cd1ec715034d17",
+        "lastblockhash" : "0x6b16723c587fbe2237eeba1844b48b4ef70577438154a54fd30b3fc9de4f9310",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,255 +120,13 @@
             }
         }
     },
-    "callWithHighValueAndGasOOG_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "8302e88248d418ce95852ab9cce269ed6a847f5143d94d0e1da84b1edac40028"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x82a8",
-                    "hash" : "0x3ea37143c7777281b4d61c0fbeafc62213c14623dd964f52df2401afe1bbc4e0",
-                    "mixHash" : "0x40a15df26e55373c9097ba64b4aab23364ab871f201250e9e4b4d29213214b3e",
-                    "nonce" : "0x240ddd3991a75e97",
-                    "number" : "0x01",
-                    "parentHash" : "0xa330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2f",
-                    "receiptTrie" : "0xc75668d6033fc91f5897c757481e992c7be6d8cc4d03f466aeba9399a4897e0c",
-                    "stateRoot" : "0xd366cc71c911d8d238501196604ef6ec35f144900cd855e9056cc02d6d74a815",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0a330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d366cc71c911d8d238501196604ef6ec35f144900cd855e9056cc02d6d74a815a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0c75668d6033fc91f5897c757481e992c7be6d8cc4d03f466aeba9399a4897e0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282a88203e880a040a15df26e55373c9097ba64b4aab23364ab871f201250e9e4b4d29213214b3e88240ddd3991a75e97f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xa330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa31f42edb107658c8b21015bd9360c57020163034d7ccec189b908b0fa59ba2d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a31f42edb107658c8b21015bd9360c57020163034d7ccec189b908b0fa59ba2da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ea37143c7777281b4d61c0fbeafc62213c14623dd964f52df2401afe1bbc4e0",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f482a8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761f6b8",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callWithHighValueAndGasOOG_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "8302e88248d418ce95852ab9cce269ed6a847f5143d94d0e1da84b1edac40028"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x82a8",
-                    "hash" : "0x848c8edad75e6418bd2b980ebafb16d8ab94b5cf4fe7fe6549e972c58907df90",
-                    "mixHash" : "0x86531b13d6dfef80861d24d26c7c5a8bf0bd5920cc2d6021481520bec5cd2a4e",
-                    "nonce" : "0x272ff65c14198690",
-                    "number" : "0x01",
-                    "parentHash" : "0xa330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2f",
-                    "receiptTrie" : "0xc75668d6033fc91f5897c757481e992c7be6d8cc4d03f466aeba9399a4897e0c",
-                    "stateRoot" : "0xd366cc71c911d8d238501196604ef6ec35f144900cd855e9056cc02d6d74a815",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0a330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d366cc71c911d8d238501196604ef6ec35f144900cd855e9056cc02d6d74a815a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0c75668d6033fc91f5897c757481e992c7be6d8cc4d03f466aeba9399a4897e0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282a88203e880a086531b13d6dfef80861d24d26c7c5a8bf0bd5920cc2d6021481520bec5cd2a4e88272ff65c14198690f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xa330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa31f42edb107658c8b21015bd9360c57020163034d7ccec189b908b0fa59ba2d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a31f42edb107658c8b21015bd9360c57020163034d7ccec189b908b0fa59ba2da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x848c8edad75e6418bd2b980ebafb16d8ab94b5cf4fe7fe6549e972c58907df90",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f482a8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761f6b8",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "8302e88248d418ce95852ab9cce269ed6a847f5143d94d0e1da84b1edac40028"
+            "sourceHash" : "d2ec71a8af84163c7b09ec847c2a85c0fa91646ed5fc43f9ec9097350dc8ea41"
         },
         "blocks" : [
             {
@@ -379,9 +137,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xb7a1eacca2a73831f41c0aa6cbbeee350270b0665493cc332f62434c06dad0f3",
-                    "mixHash" : "0x4528fd8419bd9b14c87e092d059b68a3d608aa49bb6766a990bc8593c1f92531",
-                    "nonce" : "0x2e34ede09aae481e",
+                    "hash" : "0xaba3cd4f9f38671c7ea4774973e88c4b2de0686b9eb1d6b2a6b2ed8811325059",
+                    "mixHash" : "0x743db49cd0cb5c4ebc38b55ab75d65d9db1dd97d6b82a33b680a29b97e5131ae",
+                    "nonce" : "0x5af4c57f45280069",
                     "number" : "0x01",
                     "parentHash" : "0xa330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2f",
                     "receiptTrie" : "0x2c13f86b775fef0d1553dc12e30e21d8dc4ced98489e600f5818e67002a7ba53",
@@ -390,10 +148,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0a330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d89a55830208da708d4ae99adfcc0a1a6c0860ce7a82748c8591fb387eba95a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da02c13f86b775fef0d1553dc12e30e21d8dc4ced98489e600f5818e67002a7ba53b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a04528fd8419bd9b14c87e092d059b68a3d608aa49bb6766a990bc8593c1f92531882e34ede09aae481ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0a330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d89a55830208da708d4ae99adfcc0a1a6c0860ce7a82748c8591fb387eba95a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da02c13f86b775fef0d1553dc12e30e21d8dc4ced98489e600f5818e67002a7ba53b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0743db49cd0cb5c4ebc38b55ab75d65d9db1dd97d6b82a33b680a29b97e5131ae885af4c57f45280069f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -427,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a31f42edb107658c8b21015bd9360c57020163034d7ccec189b908b0fa59ba2da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7a1eacca2a73831f41c0aa6cbbeee350270b0665493cc332f62434c06dad0f3",
+        "lastblockhash" : "0xaba3cd4f9f38671c7ea4774973e88c4b2de0686b9eb1d6b2a6b2ed8811325059",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -482,126 +240,5 @@
                 }
             }
         }
-    },
-    "callWithHighValueAndGasOOG_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "8302e88248d418ce95852ab9cce269ed6a847f5143d94d0e1da84b1edac40028"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x99a57abd447a7217c0cddf3f96f1a336f2bc42eff86d04929c61e367809f43ce",
-                    "mixHash" : "0xe7089795b5e26403d3f8a6088a5e032baa7622bd3d0625708b76541f113d36ad",
-                    "nonce" : "0xf50eb5fe15071bff",
-                    "number" : "0x01",
-                    "parentHash" : "0xa330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2f",
-                    "receiptTrie" : "0x2c13f86b775fef0d1553dc12e30e21d8dc4ced98489e600f5818e67002a7ba53",
-                    "stateRoot" : "0xd8d89a55830208da708d4ae99adfcc0a1a6c0860ce7a82748c8591fb387eba95",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f9a0a330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8d89a55830208da708d4ae99adfcc0a1a6c0860ce7a82748c8591fb387eba95a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da02c13f86b775fef0d1553dc12e30e21d8dc4ced98489e600f5818e67002a7ba53b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0e7089795b5e26403d3f8a6088a5e032baa7622bd3d0625708b76541f113d36ad88f50eb5fe15071bfff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xa330c720211722dc559ebabfd2d97eeeea0217de56274e8006ff98d9142fdf2f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa31f42edb107658c8b21015bd9360c57020163034d7ccec189b908b0fa59ba2d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a31f42edb107658c8b21015bd9360c57020163034d7ccec189b908b0fa59ba2da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99a57abd447a7217c0cddf3f96f1a336f2bc42eff86d04929c61e367809f43ce",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0.json
index 61beee9f9..bd1146117 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndOOGatTxLevel_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "e8ab783ba1f27897d0ea5ac9acbd368551ebbcb984b5e943fc94dd7b3b1f8350"
+            "sourceHash" : "7a4ca9df65c1b385202b4fc99403ecca73c52f3d749ae23aa5bef997beef9bf5"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x8290",
-                    "hash" : "0x88078b26e575647a79b02503e7b914f3c4dcc18518e38f56adbfe63f5f9f9453",
-                    "mixHash" : "0x007d428254727b3a3de7d731b12867f8f45109e25c97500bda0afe3054f7cb96",
-                    "nonce" : "0xe4141267ffc1392b",
+                    "hash" : "0xf05c75fb5be3b19c846df79dc742a2125b9ef89e5a36f605e31ed5b22c526e7b",
+                    "mixHash" : "0x9d337bfb8d4e392b78640dee43cc00477699e5afd20fa45b15df7142774172c6",
+                    "nonce" : "0x94c652d0e6492290",
                     "number" : "0x01",
                     "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
                     "receiptTrie" : "0xbc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2ed",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd206dc06a9c18f20b71df14059b0bd9c7570babca652f3a932d13c6d108a30a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0bc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a0007d428254727b3a3de7d731b12867f8f45109e25c97500bda0afe3054f7cb9688e4141267ffc1392bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd206dc06a9c18f20b71df14059b0bd9c7570babca652f3a932d13c6d108a30a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0bc2c93941b714b039cada7f5f1a8c16a91dadd9e059cfd4ed8a7451e670cc2edb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a09d337bfb8d4e392b78640dee43cc00477699e5afd20fa45b15df7142774172c68894c652d0e6492290f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88078b26e575647a79b02503e7b914f3c4dcc18518e38f56adbfe63f5f9f9453",
+        "lastblockhash" : "0xf05c75fb5be3b19c846df79dc742a2125b9ef89e5a36f605e31ed5b22c526e7b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,255 +120,13 @@
             }
         }
     },
-    "callWithHighValueAndOOGatTxLevel_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/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "e8ab783ba1f27897d0ea5ac9acbd368551ebbcb984b5e943fc94dd7b3b1f8350"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8290",
-                    "hash" : "0x429e219324e33e2dac1ad0cf72cc6559d81784f5efe9a0e87a27875339cf0e6d",
-                    "mixHash" : "0xba8aa6f3616a5c7367b5dabf5aaa8d4fb59979bb965a200e1334157223e070e6",
-                    "nonce" : "0xcaa3c0f61f0f2fc3",
-                    "number" : "0x01",
-                    "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-                    "receiptTrie" : "0xcc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836",
-                    "stateRoot" : "0x1b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094deca",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094decaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0cc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a0ba8aa6f3616a5c7367b5dabf5aaa8d4fb59979bb965a200e1334157223e070e688caa3c0f61f0f2fc3f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x429e219324e33e2dac1ad0cf72cc6559d81784f5efe9a0e87a27875339cf0e6d",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48290",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637d70",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callWithHighValueAndOOGatTxLevel_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/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "e8ab783ba1f27897d0ea5ac9acbd368551ebbcb984b5e943fc94dd7b3b1f8350"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8290",
-                    "hash" : "0xc5d5b63d380f98921737768f323f93a6a3f1e95b0f9f28b563623bf6db100222",
-                    "mixHash" : "0x7552596b7fa18e9a09e289ca777a7c93931ed7ec192955c0fd5a472604f6d304",
-                    "nonce" : "0x615a4ce2db1408e9",
-                    "number" : "0x01",
-                    "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-                    "receiptTrie" : "0xcc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836",
-                    "stateRoot" : "0x1b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094deca",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b254c3ca7a57a190fe02bef4926102b571078c82952cbfeba0380ad8094decaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0cc6ce7e069cc246f3f670273c1180c2ffceebf38d039dc47d78684cf7a5c2836b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282908203e880a07552596b7fa18e9a09e289ca777a7c93931ed7ec192955c0fd5a472604f6d30488615a4ce2db1408e9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5d5b63d380f98921737768f323f93a6a3f1e95b0f9f28b563623bf6db100222",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48290",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637d70",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callWithHighValueAndOOGatTxLevel_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "e8ab783ba1f27897d0ea5ac9acbd368551ebbcb984b5e943fc94dd7b3b1f8350"
+            "sourceHash" : "7a4ca9df65c1b385202b4fc99403ecca73c52f3d749ae23aa5bef997beef9bf5"
         },
         "blocks" : [
             {
@@ -379,9 +137,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x46864e1c92c0e4a3618ba3762910303074a2744abb24d287674516dc60d55765",
-                    "mixHash" : "0x1a9f19f2dbeda4db66d300d3fa26c5cad99ae3cf3a38316f9aa6014074a86d6c",
-                    "nonce" : "0x855e445dd16d6c6c",
+                    "hash" : "0x47cc21ca546f37ae8c741f8a8bffa76645bc7b3959f1a4abfb4c4c16404ae5fc",
+                    "mixHash" : "0xab9e7daa74399043ae7873cc3a9104403d9b184ab2cb48f2c7d747f82e5d9d1c",
+                    "nonce" : "0x7947334070ddc9af",
                     "number" : "0x01",
                     "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
                     "receiptTrie" : "0xf56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489e",
@@ -390,10 +148,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a01a9f19f2dbeda4db66d300d3fa26c5cad99ae3cf3a38316f9aa6014074a86d6c88855e445dd16d6c6cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ab9e7daa74399043ae7873cc3a9104403d9b184ab2cb48f2c7d747f82e5d9d1c887947334070ddc9aff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -427,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46864e1c92c0e4a3618ba3762910303074a2744abb24d287674516dc60d55765",
+        "lastblockhash" : "0x47cc21ca546f37ae8c741f8a8bffa76645bc7b3959f1a4abfb4c4c16404ae5fc",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -482,126 +240,5 @@
                 }
             }
         }
-    },
-    "callWithHighValueAndOOGatTxLevel_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "e8ab783ba1f27897d0ea5ac9acbd368551ebbcb984b5e943fc94dd7b3b1f8350"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xbfcb5dbf38f956bbdac8dea9ca06d6d69dd70db7e9ded781d8c76f9c3c4b4cd8",
-                    "mixHash" : "0xf6a483a60d9eed7ecc297bb38cd9b9837704b5734121e4a778f83bb55a9d164b",
-                    "nonce" : "0xf7d7f363b4c09146",
-                    "number" : "0x01",
-                    "parentHash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-                    "receiptTrie" : "0xf56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489e",
-                    "stateRoot" : "0xe5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a071052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5d33735ceb656bc5a545fd087d544b06ec2949b4f111456682967d30c46043fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f56aa5b99f8029c038586333297514801b6e25eb9487cc8b4e57c7dad29d489eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0f6a483a60d9eed7ecc297bb38cd9b9837704b5734121e4a778f83bb55a9d164b88f7d7f363b4c09146f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x71052ed2bc0911c8cc4395cf74722f8a5831fadd347f40ecb4bba369e134b610",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e354a141bf33e51a64e2bcc8f6dfb91207d1e0880bfa5677f05b11ae5c0d3153a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfcb5dbf38f956bbdac8dea9ca06d6d69dd70db7e9ded781d8c76f9c3c4b4cd8",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6000600060006000620186a173945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0.json
index f5639f774..6fb133986 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0.json
@@ -2,10 +2,10 @@
     "callWithHighValueOOGinCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "0193b709f5d3ad0924404c1e0bcc5a8f1fb1b50d8579a651d52a508f54aa74dc"
+            "sourceHash" : "eedaa6f3440770ae09ac8d4af75112fc07f0ca8be5e620f177949436c0ab2df7"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xed3a",
-                    "hash" : "0x1d6973908e9bd5f7dc504c41e9c39e7f1e4d8308340e61c13dd1e7719fe8739d",
-                    "mixHash" : "0x74b0b59b8c212f60f64b4ea2e4c33cfada69f562726a4f8bd50f611b291dd1f7",
-                    "nonce" : "0x2931a25d2562abc2",
+                    "hash" : "0x88541b9ab1039f79e8b67b2adb2bcb31fbe2b3607be2444ac4c87b753be42184",
+                    "mixHash" : "0x7a9cc8b992809674fb0eeb5c19856fd166f8a2d3f7dad827f1e3d8d2669e6fbb",
+                    "nonce" : "0xa8ec608a22fb5d12",
                     "number" : "0x01",
                     "parentHash" : "0xe66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9",
                     "receiptTrie" : "0x759053c3f84293a88962c54f53cd6de112d1e7709c83de7e2a120ec64174e6ac",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9b8997a695a4cf144c7d93daa28cf4f16c2cc000ad993a7c5e590577a8af0dea03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0759053c3f84293a88962c54f53cd6de112d1e7709c83de7e2a120ec64174e6acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ed3a8203e880a074b0b59b8c212f60f64b4ea2e4c33cfada69f562726a4f8bd50f611b291dd1f7882931a25d2562abc2f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0e66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9b8997a695a4cf144c7d93daa28cf4f16c2cc000ad993a7c5e590577a8af0dea03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0759053c3f84293a88962c54f53cd6de112d1e7709c83de7e2a120ec64174e6acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ed3a8203e880a07a9cc8b992809674fb0eeb5c19856fd166f8a2d3f7dad827f1e3d8d2669e6fbb88a8ec608a22fb5d12f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c3f6b5ce20e696e3b8f905437f5a7f510183447efde2ae897c89f7b6352a5eca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d6973908e9bd5f7dc504c41e9c39e7f1e4d8308340e61c13dd1e7719fe8739d",
+        "lastblockhash" : "0x88541b9ab1039f79e8b67b2adb2bcb31fbe2b3607be2444ac4c87b753be42184",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callWithHighValueOOGinCall_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/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "0193b709f5d3ad0924404c1e0bcc5a8f1fb1b50d8579a651d52a508f54aa74dc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xed3a",
-                    "hash" : "0x142bf6c94075b6dddb50bf8191c102f7c5bc10945b8623d866101de296c69552",
-                    "mixHash" : "0x3b6d885b11204498a38d81ff2ea4c24246c0e6e64a9f4271472b2d697d686ba2",
-                    "nonce" : "0xa20973e81fbeabb4",
-                    "number" : "0x01",
-                    "parentHash" : "0xe66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9",
-                    "receiptTrie" : "0xf96e978358dd846877057b3ec046cff0d39a1849bba8e29eed39dcca328dd8c8",
-                    "stateRoot" : "0xf2563268fba36f28d047e095aa046236d6dfb0b232f6b5026276016359ea3cac",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0e66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2563268fba36f28d047e095aa046236d6dfb0b232f6b5026276016359ea3caca03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f96e978358dd846877057b3ec046cff0d39a1849bba8e29eed39dcca328dd8c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ed3a8203e880a03b6d885b11204498a38d81ff2ea4c24246c0e6e64a9f4271472b2d697d686ba288a20973e81fbeabb4f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7c3f6b5ce20e696e3b8f905437f5a7f510183447efde2ae897c89f7b6352a5ec",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c3f6b5ce20e696e3b8f905437f5a7f510183447efde2ae897c89f7b6352a5eca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x142bf6c94075b6dddb50bf8191c102f7c5bc10945b8623d866101de296c69552",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60016000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5612710f101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ed3a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76312c6",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60016000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5612710f101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callWithHighValueOOGinCall_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/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "0193b709f5d3ad0924404c1e0bcc5a8f1fb1b50d8579a651d52a508f54aa74dc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xed3a",
-                    "hash" : "0x1ac5e557d4366d4efd358113dfa4bef3ab009672e04cc69943d12d5bf4e54d3d",
-                    "mixHash" : "0x30e3693fa2ba03571ecab0a3715476ab0c063d768765cb13466f871b6adf413a",
-                    "nonce" : "0x931a36990cf0a002",
-                    "number" : "0x01",
-                    "parentHash" : "0xe66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9",
-                    "receiptTrie" : "0xf96e978358dd846877057b3ec046cff0d39a1849bba8e29eed39dcca328dd8c8",
-                    "stateRoot" : "0xf2563268fba36f28d047e095aa046236d6dfb0b232f6b5026276016359ea3cac",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0e66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2563268fba36f28d047e095aa046236d6dfb0b232f6b5026276016359ea3caca03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0f96e978358dd846877057b3ec046cff0d39a1849bba8e29eed39dcca328dd8c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ed3a8203e880a030e3693fa2ba03571ecab0a3715476ab0c063d768765cb13466f871b6adf413a88931a36990cf0a002f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7c3f6b5ce20e696e3b8f905437f5a7f510183447efde2ae897c89f7b6352a5ec",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c3f6b5ce20e696e3b8f905437f5a7f510183447efde2ae897c89f7b6352a5eca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ac5e557d4366d4efd358113dfa4bef3ab009672e04cc69943d12d5bf4e54d3d",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60016000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5612710f101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ed3a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76312c6",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60016000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5612710f101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callWithHighValueOOGinCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "0193b709f5d3ad0924404c1e0bcc5a8f1fb1b50d8579a651d52a508f54aa74dc"
+            "sourceHash" : "eedaa6f3440770ae09ac8d4af75112fc07f0ca8be5e620f177949436c0ab2df7"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xeaa6",
-                    "hash" : "0x9c00d23f5dd2f3edaf0896d89392071c7c0cc573e5a58c87e8f547c41e8da652",
-                    "mixHash" : "0x57a26018b80032c7a118987ed50623dba17938c3d4a47a39ffbce4b2817244dd",
-                    "nonce" : "0x98c9279c95d4f4b9",
+                    "hash" : "0x2a00a722801a7755d0a4a967a6c3dfd474eb7fa8815fb2c9c7b5c5146378d764",
+                    "mixHash" : "0xc035875aabce563061f68d42da956d6a0563d230f5f01975482ba0180bf1faaa",
+                    "nonce" : "0x13c63c3148d97a25",
                     "number" : "0x01",
                     "parentHash" : "0xe66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9",
                     "receiptTrie" : "0x5766741ebb786450a12e4e951d79915213fc6074d9405831fb260ffde4509f00",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b99d45e4f85f475757b0f547d6113ff74d989d2422786975855e1ddce12984ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05766741ebb786450a12e4e951d79915213fc6074d9405831fb260ffde4509f00b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eaa68203e880a057a26018b80032c7a118987ed50623dba17938c3d4a47a39ffbce4b2817244dd8898c9279c95d4f4b9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0e66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b99d45e4f85f475757b0f547d6113ff74d989d2422786975855e1ddce12984ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05766741ebb786450a12e4e951d79915213fc6074d9405831fb260ffde4509f00b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eaa68203e880a0c035875aabce563061f68d42da956d6a0563d230f5f01975482ba0180bf1faaa8813c63c3148d97a25f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c3f6b5ce20e696e3b8f905437f5a7f510183447efde2ae897c89f7b6352a5eca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c00d23f5dd2f3edaf0896d89392071c7c0cc573e5a58c87e8f547c41e8da652",
+        "lastblockhash" : "0x2a00a722801a7755d0a4a967a6c3dfd474eb7fa8815fb2c9c7b5c5146378d764",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callWithHighValueOOGinCall_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "0193b709f5d3ad0924404c1e0bcc5a8f1fb1b50d8579a651d52a508f54aa74dc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xeaa6",
-                    "hash" : "0x8a41ccb625d08e44d3067adc6f239d569f9e62b4ff82bc0c204f091fdbbce905",
-                    "mixHash" : "0xc399ffc8b961f6f23b74cc0c7ea5a865c0bea01d20305a8d7c830419bd6e2a50",
-                    "nonce" : "0xc9756c944d0b41c5",
-                    "number" : "0x01",
-                    "parentHash" : "0xe66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9",
-                    "receiptTrie" : "0x5766741ebb786450a12e4e951d79915213fc6074d9405831fb260ffde4509f00",
-                    "stateRoot" : "0x1b99d45e4f85f475757b0f547d6113ff74d989d2422786975855e1ddce12984b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0e66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b99d45e4f85f475757b0f547d6113ff74d989d2422786975855e1ddce12984ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05766741ebb786450a12e4e951d79915213fc6074d9405831fb260ffde4509f00b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eaa68203e880a0c399ffc8b961f6f23b74cc0c7ea5a865c0bea01d20305a8d7c830419bd6e2a5088c9756c944d0b41c5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe66fd95246b1523e7e86eda2a6ff43ee4780cd81eb67c5fd1fd40fbb6651abe9",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7c3f6b5ce20e696e3b8f905437f5a7f510183447efde2ae897c89f7b6352a5ec",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c3f6b5ce20e696e3b8f905437f5a7f510183447efde2ae897c89f7b6352a5eca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a41ccb625d08e44d3067adc6f239d569f9e62b4ff82bc0c204f091fdbbce905",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60016000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5612710f101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eaa6",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763155a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60016000600060006000601773945304eb96065b2a98b57a48a06ae28d285a71b5612710f101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0.json
index bb18cbf83..186e9bce8 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0.json
@@ -2,10 +2,10 @@
     "callWithHighValue_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "dc83f2a551fc480b7c35b6c83f858dc09baa3b65752cc51ac557d4d7dfff6f3c"
+            "sourceHash" : "a60bd2d20d2a63a4d2d22711ddf153b8ea89fa9e80bbede02ad2fdb6ad62a52b"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x8296",
-                    "hash" : "0x91653b78dae5159e8529ecf9bc55b1a23719d0bbcb9e18c7fd877808479423c6",
-                    "mixHash" : "0x1f36978668e09b8775e69ebdd38ffc65874698a284f3e19d3b19322b1e98f5e6",
-                    "nonce" : "0x1374550fa0f7429d",
+                    "hash" : "0x6441278feb4a0e391e8449a4c5959c5568caee5137c899381702f212f69893d4",
+                    "mixHash" : "0x858c01dd4c5a0d597717f9dbac56ba6ce3d164a8c80952be4ebc6ecdf2c18512",
+                    "nonce" : "0xd301118d4a6f4731",
                     "number" : "0x01",
                     "parentHash" : "0x42fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bb",
                     "receiptTrie" : "0x57bdfca4e37287ae76f4783a657dd2bdc215b8f6ff5f860041d573f0be2c7e8f",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a042fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060a00b098474ee976ca65ce5348e1f06060fc026ea6668c2f42e46348d850d59a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a057bdfca4e37287ae76f4783a657dd2bdc215b8f6ff5f860041d573f0be2c7e8fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282968203e880a01f36978668e09b8775e69ebdd38ffc65874698a284f3e19d3b19322b1e98f5e6881374550fa0f7429df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a042fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060a00b098474ee976ca65ce5348e1f06060fc026ea6668c2f42e46348d850d59a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a057bdfca4e37287ae76f4783a657dd2bdc215b8f6ff5f860041d573f0be2c7e8fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282968203e880a0858c01dd4c5a0d597717f9dbac56ba6ce3d164a8c80952be4ebc6ecdf2c1851288d301118d4a6f4731f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0565ab47d0f244da364d2b05a6f25530ced115ce7b5ba6c9b2125f5177dc3c041a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91653b78dae5159e8529ecf9bc55b1a23719d0bbcb9e18c7fd877808479423c6",
+        "lastblockhash" : "0x6441278feb4a0e391e8449a4c5959c5568caee5137c899381702f212f69893d4",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,255 +120,13 @@
             }
         }
     },
-    "callWithHighValue_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/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "dc83f2a551fc480b7c35b6c83f858dc09baa3b65752cc51ac557d4d7dfff6f3c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8296",
-                    "hash" : "0xef6c9d12d08086590c32bd315ae8d1d07300c5fe4d236bf3eb73de1025cc4acf",
-                    "mixHash" : "0x6851bb543e152c5bd1bb875b75b82f991581ef1c4f7b35c039c919fa92aa66f4",
-                    "nonce" : "0x92d9c7cf5a2f25fd",
-                    "number" : "0x01",
-                    "parentHash" : "0x42fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bb",
-                    "receiptTrie" : "0x80aa08ef94eab64469d0fcb47be0a03213ea36ef49b4369f8cf5f14797e25340",
-                    "stateRoot" : "0x068e0dd43fccc89bac692af7f7d557e4db76b56a36f60f0e7181cc1775105945",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a042fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0068e0dd43fccc89bac692af7f7d557e4db76b56a36f60f0e7181cc1775105945a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a080aa08ef94eab64469d0fcb47be0a03213ea36ef49b4369f8cf5f14797e25340b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282968203e880a06851bb543e152c5bd1bb875b75b82f991581ef1c4f7b35c039c919fa92aa66f48892d9c7cf5a2f25fdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x42fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x565ab47d0f244da364d2b05a6f25530ced115ce7b5ba6c9b2125f5177dc3c041",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0565ab47d0f244da364d2b05a6f25530ced115ce7b5ba6c9b2125f5177dc3c041a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef6c9d12d08086590c32bd315ae8d1d07300c5fe4d236bf3eb73de1025cc4acf",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48296",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637d6a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callWithHighValue_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/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "dc83f2a551fc480b7c35b6c83f858dc09baa3b65752cc51ac557d4d7dfff6f3c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8296",
-                    "hash" : "0xda4f7330dbe7d24e38c02c83a1fe73f3793552f81f592f4066f26d950c470abd",
-                    "mixHash" : "0x157deb552dc461b216b3537caa7136d42c649179e4484ad4f753933fa6f8fce5",
-                    "nonce" : "0x2e72f63dcf6af329",
-                    "number" : "0x01",
-                    "parentHash" : "0x42fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bb",
-                    "receiptTrie" : "0x80aa08ef94eab64469d0fcb47be0a03213ea36ef49b4369f8cf5f14797e25340",
-                    "stateRoot" : "0x068e0dd43fccc89bac692af7f7d557e4db76b56a36f60f0e7181cc1775105945",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a042fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0068e0dd43fccc89bac692af7f7d557e4db76b56a36f60f0e7181cc1775105945a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a080aa08ef94eab64469d0fcb47be0a03213ea36ef49b4369f8cf5f14797e25340b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282968203e880a0157deb552dc461b216b3537caa7136d42c649179e4484ad4f753933fa6f8fce5882e72f63dcf6af329f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x42fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x565ab47d0f244da364d2b05a6f25530ced115ce7b5ba6c9b2125f5177dc3c041",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0565ab47d0f244da364d2b05a6f25530ced115ce7b5ba6c9b2125f5177dc3c041a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda4f7330dbe7d24e38c02c83a1fe73f3793552f81f592f4066f26d950c470abd",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48296",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637d6a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callWithHighValue_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "dc83f2a551fc480b7c35b6c83f858dc09baa3b65752cc51ac557d4d7dfff6f3c"
+            "sourceHash" : "a60bd2d20d2a63a4d2d22711ddf153b8ea89fa9e80bbede02ad2fdb6ad62a52b"
         },
         "blocks" : [
             {
@@ -379,9 +137,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x8002",
-                    "hash" : "0xa0aef8d327a2378581a6772d0b85438d847474ad9bebee15f1d987a149b6fa60",
-                    "mixHash" : "0x8b2f333e7284dff271bf3cfeb26a5f3fe81909ac85fdce86b6e0122b02653e8e",
-                    "nonce" : "0xf3fd9b2d83e67a8d",
+                    "hash" : "0xab8ee0cd42858beb44fdd5bdf82044a35a4e930d95d24a578fa1f6fbc90d6596",
+                    "mixHash" : "0xa40ad363cd1c97b8d14e29c007c2851485fcc6b43b92094e1cd914b93b8dbd49",
+                    "nonce" : "0xec10b21893c455a0",
                     "number" : "0x01",
                     "parentHash" : "0x42fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bb",
                     "receiptTrie" : "0x849a67b5c059ceb160c617f503eaa08fd131ca2dc4dcdefc18dca811c2c1fb4b",
@@ -390,10 +148,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a042fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b13074b072993515ae6c3ae38bf24842355dbe850c409fdb647f98e712e8a78a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0849a67b5c059ceb160c617f503eaa08fd131ca2dc4dcdefc18dca811c2c1fb4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808280028203e880a08b2f333e7284dff271bf3cfeb26a5f3fe81909ac85fdce86b6e0122b02653e8e88f3fd9b2d83e67a8df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a042fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b13074b072993515ae6c3ae38bf24842355dbe850c409fdb647f98e712e8a78a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0849a67b5c059ceb160c617f503eaa08fd131ca2dc4dcdefc18dca811c2c1fb4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808280028203e880a0a40ad363cd1c97b8d14e29c007c2851485fcc6b43b92094e1cd914b93b8dbd4988ec10b21893c455a0f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -427,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0565ab47d0f244da364d2b05a6f25530ced115ce7b5ba6c9b2125f5177dc3c041a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0aef8d327a2378581a6772d0b85438d847474ad9bebee15f1d987a149b6fa60",
+        "lastblockhash" : "0xab8ee0cd42858beb44fdd5bdf82044a35a4e930d95d24a578fa1f6fbc90d6596",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -482,126 +240,5 @@
                 }
             }
         }
-    },
-    "callWithHighValue_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "dc83f2a551fc480b7c35b6c83f858dc09baa3b65752cc51ac557d4d7dfff6f3c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8002",
-                    "hash" : "0x25f1d90ab4cef2428bef4929c07171919e5ffd275ec1d0e1a5dd0f20220944fe",
-                    "mixHash" : "0x7893773f8768056acf72a766cfa3b4214f92cc82fb053b3c51770e1487d383e6",
-                    "nonce" : "0xc2e825206a658a73",
-                    "number" : "0x01",
-                    "parentHash" : "0x42fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bb",
-                    "receiptTrie" : "0x849a67b5c059ceb160c617f503eaa08fd131ca2dc4dcdefc18dca811c2c1fb4b",
-                    "stateRoot" : "0x3b13074b072993515ae6c3ae38bf24842355dbe850c409fdb647f98e712e8a78",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a042fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b13074b072993515ae6c3ae38bf24842355dbe850c409fdb647f98e712e8a78a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0849a67b5c059ceb160c617f503eaa08fd131ca2dc4dcdefc18dca811c2c1fb4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808280028203e880a07893773f8768056acf72a766cfa3b4214f92cc82fb053b3c51770e1487d383e688c2e825206a658a73f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x42fac9801428982054dc0ef31070cfac588df0f55c9f423bd4c08b82434ce2bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x565ab47d0f244da364d2b05a6f25530ced115ce7b5ba6c9b2125f5177dc3c041",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0565ab47d0f244da364d2b05a6f25530ced115ce7b5ba6c9b2125f5177dc3c041a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x25f1d90ab4cef2428bef4929c07171919e5ffd275ec1d0e1a5dd0f20220944fe",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48002",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637ffe",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0.json
index 7c57f366d..496e09988 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c31db357b73546d0b12bb5a61720568ef90e897e87ed29393eef14da19c30e6b"
+            "sourceHash" : "ec41c69895df1b30452c74985bd54d0e50b6ed4c3316707a373dd5de62c1d425"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a4",
-                    "hash" : "0x4afcbf6f0d5a614deb0dd4f905802a33e13046e42f7f0652d38f7bdf54c8cd00",
-                    "mixHash" : "0x1ba27d1a3fa3aa23aa66acc4f5f6316c4491fc9011d0795ec7cc298e30935a93",
-                    "nonce" : "0xadd2b69faf682df1",
+                    "hash" : "0xcf18060d56904faf0b0f6f69ecab893128320fadc555c87047fb165520f6058c",
+                    "mixHash" : "0xa64eea61d16034f7e439851edc1e43ff40c204c5ed36ea55b6a1ec030f258c53",
+                    "nonce" : "0xaeaceb491ea7a890",
                     "number" : "0x01",
                     "parentHash" : "0x3757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42d",
                     "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3d2e9cff1593694fefb48e50d583696d92aea1361c0d79d7c5e69b6f3bc5f9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a01ba27d1a3fa3aa23aa66acc4f5f6316c4491fc9011d0795ec7cc298e30935a9388add2b69faf682df1f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a03757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3d2e9cff1593694fefb48e50d583696d92aea1361c0d79d7c5e69b6f3bc5f9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0a64eea61d16034f7e439851edc1e43ff40c204c5ed36ea55b6a1ec030f258c5388aeaceb491ea7a890f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084ec9af4246521eaacc2401a92ee86bd23d15f2fdb6b445c8e6c2cf592a6d060a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4afcbf6f0d5a614deb0dd4f905802a33e13046e42f7f0652d38f7bdf54c8cd00",
+        "lastblockhash" : "0xcf18060d56904faf0b0f6f69ecab893128320fadc555c87047fb165520f6058c",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callcodeOutput1_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c31db357b73546d0b12bb5a61720568ef90e897e87ed29393eef14da19c30e6b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0xa3b1a7fb453b33d22e60b3afaf377590d2c387a1797ee4ab7debc51c35b957fe",
-                    "mixHash" : "0x96aed605ce1247a71cdd1e3c853400177297e1e6e6e3739cefff6dd5b39258b6",
-                    "nonce" : "0xb5fef8b4d104f8b2",
-                    "number" : "0x01",
-                    "parentHash" : "0x3757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42d",
-                    "receiptTrie" : "0x6720190260fc2d89d71f80de070a27f7eb940402b08a32e91db6b113aa0c6756",
-                    "stateRoot" : "0xa5c78c445d38c146d16a76800d034bbf90ab9a2436bdc1a9e1bfb2c90f56666f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a03757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5c78c445d38c146d16a76800d034bbf90ab9a2436bdc1a9e1bfb2c90f56666fa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da06720190260fc2d89d71f80de070a27f7eb940402b08a32e91db6b113aa0c6756b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a096aed605ce1247a71cdd1e3c853400177297e1e6e6e3739cefff6dd5b39258b688b5fef8b4d104f8b2f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x3757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x84ec9af4246521eaacc2401a92ee86bd23d15f2fdb6b445c8e6c2cf592a6d060",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084ec9af4246521eaacc2401a92ee86bd23d15f2fdb6b445c8e6c2cf592a6d060a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa3b1a7fb453b33d22e60b3afaf377590d2c387a1797ee4ab7debc51c35b957fe",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c31db357b73546d0b12bb5a61720568ef90e897e87ed29393eef14da19c30e6b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0x5c134e1cf72efbe19351a0e0524e61836f16df409fd3234a99701b7542a2fb82",
-                    "mixHash" : "0x7c207f48567f3682c8cb60077c7138d15e3502edf5e2d7861805ad08b8585485",
-                    "nonce" : "0xe570a7374a9ca3d3",
-                    "number" : "0x01",
-                    "parentHash" : "0x3757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42d",
-                    "receiptTrie" : "0xdab0746494ffe3003787c86c995556363722dc0bc8d6190a944946b40f269f8e",
-                    "stateRoot" : "0xa5c78c445d38c146d16a76800d034bbf90ab9a2436bdc1a9e1bfb2c90f56666f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a03757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5c78c445d38c146d16a76800d034bbf90ab9a2436bdc1a9e1bfb2c90f56666fa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0dab0746494ffe3003787c86c995556363722dc0bc8d6190a944946b40f269f8eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a07c207f48567f3682c8cb60077c7138d15e3502edf5e2d7861805ad08b858548588e570a7374a9ca3d3f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x3757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x84ec9af4246521eaacc2401a92ee86bd23d15f2fdb6b445c8e6c2cf592a6d060",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084ec9af4246521eaacc2401a92ee86bd23d15f2fdb6b445c8e6c2cf592a6d060a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c134e1cf72efbe19351a0e0524e61836f16df409fd3234a99701b7542a2fb82",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c31db357b73546d0b12bb5a61720568ef90e897e87ed29393eef14da19c30e6b"
+            "sourceHash" : "ec41c69895df1b30452c74985bd54d0e50b6ed4c3316707a373dd5de62c1d425"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb410",
-                    "hash" : "0x356eac2c4e0d335368e31505372065a1bba16ec72a5debe4b73c7d0d482214f8",
-                    "mixHash" : "0xf71bcef64399d84b2fe03c722628b60565eeb96598d9d0d0f90a6e219d085e3e",
-                    "nonce" : "0x705a881bdb9f0c2d",
+                    "hash" : "0x6076ec0debc75ca23faaa7ac67085cc69294fa6219045190da008f7ea0873455",
+                    "mixHash" : "0xba7be52ab4c2f00fcad8ac01bd087dea79e3e4765047e372ae44d4fa4341153b",
+                    "nonce" : "0x5ee288f396d935fb",
                     "number" : "0x01",
                     "parentHash" : "0x3757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42d",
                     "receiptTrie" : "0xf4da881cf0e6a7e85c65fce910de7d8fe4a60f17ec220aee65019eefb75186a3",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a03757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5c78c445d38c146d16a76800d034bbf90ab9a2436bdc1a9e1bfb2c90f56666fa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f4da881cf0e6a7e85c65fce910de7d8fe4a60f17ec220aee65019eefb75186a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a0f71bcef64399d84b2fe03c722628b60565eeb96598d9d0d0f90a6e219d085e3e88705a881bdb9f0c2df865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a03757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5c78c445d38c146d16a76800d034bbf90ab9a2436bdc1a9e1bfb2c90f56666fa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f4da881cf0e6a7e85c65fce910de7d8fe4a60f17ec220aee65019eefb75186a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a0ba7be52ab4c2f00fcad8ac01bd087dea79e3e4765047e372ae44d4fa4341153b885ee288f396d935fbf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084ec9af4246521eaacc2401a92ee86bd23d15f2fdb6b445c8e6c2cf592a6d060a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x356eac2c4e0d335368e31505372065a1bba16ec72a5debe4b73c7d0d482214f8",
+        "lastblockhash" : "0x6076ec0debc75ca23faaa7ac67085cc69294fa6219045190da008f7ea0873455",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callcodeOutput1_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c31db357b73546d0b12bb5a61720568ef90e897e87ed29393eef14da19c30e6b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb410",
-                    "hash" : "0xa0edc1a0c7f0edfab4e5c2cf4734785fb771f08ace55f85010bc7e587d87d673",
-                    "mixHash" : "0xbea2e721420867b29373e8151e1df137a593499270b53bf2e950a7856fa94046",
-                    "nonce" : "0x988477a770b4b2b5",
-                    "number" : "0x01",
-                    "parentHash" : "0x3757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42d",
-                    "receiptTrie" : "0xf4da881cf0e6a7e85c65fce910de7d8fe4a60f17ec220aee65019eefb75186a3",
-                    "stateRoot" : "0xa5c78c445d38c146d16a76800d034bbf90ab9a2436bdc1a9e1bfb2c90f56666f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a03757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5c78c445d38c146d16a76800d034bbf90ab9a2436bdc1a9e1bfb2c90f56666fa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f4da881cf0e6a7e85c65fce910de7d8fe4a60f17ec220aee65019eefb75186a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a0bea2e721420867b29373e8151e1df137a593499270b53bf2e950a7856fa9404688988477a770b4b2b5f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x3757acd6ae5d53bad5b3e3334226a5668a990ac861cbf05fff2fe181a203f42d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x84ec9af4246521eaacc2401a92ee86bd23d15f2fdb6b445c8e6c2cf592a6d060",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084ec9af4246521eaacc2401a92ee86bd23d15f2fdb6b445c8e6c2cf592a6d060a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0edc1a0c7f0edfab4e5c2cf4734785fb771f08ace55f85010bc7e587d87d673",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0.json
index a47c337f9..f75970807 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "32ba059cb05f5782d541b5f4b2d21e2fb46b5b1c03de9630d19392de74ea0c37"
+            "sourceHash" : "94379800652a4973a482d63856198e6eb2973f7f7b91a700b8c4fb94282e1a91"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a4",
-                    "hash" : "0xb68e0759643db1e281b65dd62593d49a82d03a6807dfb65972953538a6f71786",
-                    "mixHash" : "0xc0c06b3d9480c2708ad4142452c6da254f4d40175b8346f06732a3520d203fcf",
-                    "nonce" : "0x3d4457f3333b8d17",
+                    "hash" : "0x8f5d4249641787399cf47f759f283f4988241a6e095c7079ce2ed787480bdc5c",
+                    "mixHash" : "0x307497f4badc2678f3eaf161dc280a3d3d5ed89812ae62a95bfb10e86b226303",
+                    "nonce" : "0xa0632000fbb7d96d",
                     "number" : "0x01",
                     "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
                     "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635544814a5391f18cc813941534d03a3f4869bfe605b116189447137874ab88a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0c0c06b3d9480c2708ad4142452c6da254f4d40175b8346f06732a3520d203fcf883d4457f3333b8d17f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635544814a5391f18cc813941534d03a3f4869bfe605b116189447137874ab88a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0307497f4badc2678f3eaf161dc280a3d3d5ed89812ae62a95bfb10e86b22630388a0632000fbb7d96df865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb68e0759643db1e281b65dd62593d49a82d03a6807dfb65972953538a6f71786",
+        "lastblockhash" : "0x8f5d4249641787399cf47f759f283f4988241a6e095c7079ce2ed787480bdc5c",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "32ba059cb05f5782d541b5f4b2d21e2fb46b5b1c03de9630d19392de74ea0c37"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0x3045403bbe1e307d261eecaa3a55730eca7718c0654f96ef4ea8ef3ca872f422",
-                    "mixHash" : "0x550b12c090272e5294594ebf47349e053f9a6de633fb51bdb31021f36179a7e0",
-                    "nonce" : "0xe3845c8939ae4b6e",
-                    "number" : "0x01",
-                    "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-                    "receiptTrie" : "0xb694fdac44d0e97436ddffd833a8c7a72e2e81e9499a57289ff5c82f197cf0a5",
-                    "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0b694fdac44d0e97436ddffd833a8c7a72e2e81e9499a57289ff5c82f197cf0a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0550b12c090272e5294594ebf47349e053f9a6de633fb51bdb31021f36179a7e088e3845c8939ae4b6ef865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3045403bbe1e307d261eecaa3a55730eca7718c0654f96ef4ea8ef3ca872f422",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "32ba059cb05f5782d541b5f4b2d21e2fb46b5b1c03de9630d19392de74ea0c37"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0x599d7c2030729f971b7435c0246b16d9d7a7a32331a24fc2a882f792dcdbf754",
-                    "mixHash" : "0xbd0e7e72328f717d3ad1ab1d2f8e4c6ec94de94c733b5e314471d8e1e0299218",
-                    "nonce" : "0xc50186409b1693e8",
-                    "number" : "0x01",
-                    "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-                    "receiptTrie" : "0xf003b32943eac96f82682119dde8c37d0718c03e018c7c4ccd32086e972eae12",
-                    "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f003b32943eac96f82682119dde8c37d0718c03e018c7c4ccd32086e972eae12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0bd0e7e72328f717d3ad1ab1d2f8e4c6ec94de94c733b5e314471d8e1e029921888c50186409b1693e8f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x599d7c2030729f971b7435c0246b16d9d7a7a32331a24fc2a882f792dcdbf754",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "32ba059cb05f5782d541b5f4b2d21e2fb46b5b1c03de9630d19392de74ea0c37"
+            "sourceHash" : "94379800652a4973a482d63856198e6eb2973f7f7b91a700b8c4fb94282e1a91"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb410",
-                    "hash" : "0xecb23ca133ae4f818dff383ce2c0000985f07e801c37402dfc43eaa61c877941",
-                    "mixHash" : "0x22f91ba6ee8176adaf59984d7ad620ce4dabbdb5a83e7104165d789fc66823df",
-                    "nonce" : "0x60a0318603cef8b7",
+                    "hash" : "0xda977d438b9c5140a4d8a60a88401319ac6819bdc8015491be468f642cac6e9c",
+                    "mixHash" : "0x4dcd3ae30b888d5db7e82b4befee3d1bbdb62c43d3480330fa6e05975a8ad07b",
+                    "nonce" : "0x7cd299e293476ea6",
                     "number" : "0x01",
                     "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
                     "receiptTrie" : "0x2487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da02487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a022f91ba6ee8176adaf59984d7ad620ce4dabbdb5a83e7104165d789fc66823df8860a0318603cef8b7f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da02487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a04dcd3ae30b888d5db7e82b4befee3d1bbdb62c43d3480330fa6e05975a8ad07b887cd299e293476ea6f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecb23ca133ae4f818dff383ce2c0000985f07e801c37402dfc43eaa61c877941",
+        "lastblockhash" : "0xda977d438b9c5140a4d8a60a88401319ac6819bdc8015491be468f642cac6e9c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callcodeOutput2_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "32ba059cb05f5782d541b5f4b2d21e2fb46b5b1c03de9630d19392de74ea0c37"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb410",
-                    "hash" : "0x245e50a8f26c407bf348e7d8d3e2aab5faf2de12146522be71c48bbef57afe36",
-                    "mixHash" : "0x4100917fc6fe070a0e71ed032959fc0be518533061f73601e1ac69af47a25e74",
-                    "nonce" : "0x6d6d6dcfafd878d8",
-                    "number" : "0x01",
-                    "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-                    "receiptTrie" : "0x2487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073",
-                    "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da02487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a04100917fc6fe070a0e71ed032959fc0be518533061f73601e1ac69af47a25e74886d6d6dcfafd878d8f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x245e50a8f26c407bf348e7d8d3e2aab5faf2de12146522be71c48bbef57afe36",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0.json
index 69b10c1b0..ecf4d1277 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "b91b9a27b785a501fcbd04d6cb05e2e27863afb378e0319ebc0dcac440d2a8c3"
+            "sourceHash" : "95ba725f4604371981af2a2a2a7b24f715e4a3d59c696c87557aa34e003bfbc6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016660",
-                    "hash" : "0xc2f05a0770a51e6dbd326cd4e6ed904f5307eb059d3bd4a1aca74a866811febe",
-                    "mixHash" : "0x01dad677c52b2e031f8a2303080bf859ea83cc93a910f462755ed8030fcfe93c",
-                    "nonce" : "0x58d4632efda72b22",
+                    "hash" : "0xc0b949df1fdb896c5000fc8d7dc4ecea248d7f2ed4999127e9ae7faa403a8f6e",
+                    "mixHash" : "0xb35ecb1c528412028fff926dc61ef384ab104a1fe2c48a2ceb5cf481e01820ab",
+                    "nonce" : "0x6401d0ac0da28d00",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x11a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070d2fd080222bfcf49d0b6bb9dcf065f0e98290eb62bfd09b1b14afa4c83d2c1a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a001dad677c52b2e031f8a2303080bf859ea83cc93a910f462755ed8030fcfe93c8858d4632efda72b22f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90263f901f8a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa070d2fd080222bfcf49d0b6bb9dcf065f0e98290eb62bfd09b1b14afa4c83d2c1a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a0b35ecb1c528412028fff926dc61ef384ab104a1fe2c48a2ceb5cf481e01820ab886401d0ac0da28d00f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2f05a0770a51e6dbd326cd4e6ed904f5307eb059d3bd4a1aca74a866811febe",
+        "lastblockhash" : "0xc0b949df1fdb896c5000fc8d7dc4ecea248d7f2ed4999127e9ae7faa403a8f6e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callcodeOutput3Fail_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "b91b9a27b785a501fcbd04d6cb05e2e27863afb378e0319ebc0dcac440d2a8c3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016660",
-                    "hash" : "0x81bba8f9b66266ae8b3f7c3cfc8eb751a5272799bb2a4dc866af37715e0d1203",
-                    "mixHash" : "0x3c44c6d6de6f14fc8deeecd6b17cf559525d06475b1639e270435dd724a7038b",
-                    "nonce" : "0x9e03b062c07094f4",
-                    "number" : "0x01",
-                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "0xd45bd25982caed6f7ed666d870745d110b6e352750862eb19077699e1e551acb",
-                    "stateRoot" : "0xcf280d7e4bc2b97d88436b961013b0f59f99831f79ede5e72e6a752e45a7c3db",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf280d7e4bc2b97d88436b961013b0f59f99831f79ede5e72e6a752e45a7c3dba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0d45bd25982caed6f7ed666d870745d110b6e352750862eb19077699e1e551acbb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a03c44c6d6de6f14fc8deeecd6b17cf559525d06475b1639e270435dd724a7038b889e03b062c07094f4f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81bba8f9b66266ae8b3f7c3cfc8eb751a5272799bb2a4dc866af37715e0d1203",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3Fail_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "b91b9a27b785a501fcbd04d6cb05e2e27863afb378e0319ebc0dcac440d2a8c3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016660",
-                    "hash" : "0xa45ce4b3f827a15d6a5781a014853eea6f1f4d5238b3eb6fe9a97c383ab13084",
-                    "mixHash" : "0x3a12faea5acbea6dc70cd55c1c744dbd87dcc38ee45a0f1f92d67bd1461f9cea",
-                    "nonce" : "0xb8a23ab840314ee3",
-                    "number" : "0x01",
-                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "0x45614fdbf8c261663ca9b4b5215d485216ccfc4b13e0eb01fc6eca6bbf897e5a",
-                    "stateRoot" : "0xcf280d7e4bc2b97d88436b961013b0f59f99831f79ede5e72e6a752e45a7c3db",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf280d7e4bc2b97d88436b961013b0f59f99831f79ede5e72e6a752e45a7c3dba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da045614fdbf8c261663ca9b4b5215d485216ccfc4b13e0eb01fc6eca6bbf897e5ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a03a12faea5acbea6dc70cd55c1c744dbd87dcc38ee45a0f1f92d67bd1461f9cea88b8a23ab840314ee3f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa45ce4b3f827a15d6a5781a014853eea6f1f4d5238b3eb6fe9a97c383ab13084",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput3Fail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "b91b9a27b785a501fcbd04d6cb05e2e27863afb378e0319ebc0dcac440d2a8c3"
+            "sourceHash" : "95ba725f4604371981af2a2a2a7b24f715e4a3d59c696c87557aa34e003bfbc6"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163cc",
-                    "hash" : "0x9d18af8364752e86be5dfb48a5927ec81c6608215726680d812c031dbff0711d",
-                    "mixHash" : "0x19f23bc32101dc7b86be391af929bac292f3427940ac2a6e8be7252fde2c348b",
-                    "nonce" : "0x738bc0d3d7872d51",
+                    "hash" : "0x7ddb7499c51631691b49fe1fed943079843a1b61f5f4a38d79b2b81bc8d03e15",
+                    "mixHash" : "0x455f4c3486326b53860d7c81fa4d3a760aa0af00787a2897e228c06dceb00cca",
+                    "nonce" : "0x0973163e023470aa",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0xcb13734c005e3002ab78fe920c93070efe7e2af7b00adc4822c5e58b2634e53b",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf280d7e4bc2b97d88436b961013b0f59f99831f79ede5e72e6a752e45a7c3dba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0cb13734c005e3002ab78fe920c93070efe7e2af7b00adc4822c5e58b2634e53bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a019f23bc32101dc7b86be391af929bac292f3427940ac2a6e8be7252fde2c348b88738bc0d3d7872d51f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90263f901f8a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf280d7e4bc2b97d88436b961013b0f59f99831f79ede5e72e6a752e45a7c3dba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0cb13734c005e3002ab78fe920c93070efe7e2af7b00adc4822c5e58b2634e53bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a0455f4c3486326b53860d7c81fa4d3a760aa0af00787a2897e228c06dceb00cca880973163e023470aaf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d18af8364752e86be5dfb48a5927ec81c6608215726680d812c031dbff0711d",
+        "lastblockhash" : "0x7ddb7499c51631691b49fe1fed943079843a1b61f5f4a38d79b2b81bc8d03e15",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callcodeOutput3Fail_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "b91b9a27b785a501fcbd04d6cb05e2e27863afb378e0319ebc0dcac440d2a8c3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0163cc",
-                    "hash" : "0x93fd33dea5aef8a31201f6dd03006e78207e11ff33ecb20ce80708ca787fb044",
-                    "mixHash" : "0x07f85caa1998dbcc61434fa4e278bec92715f07d88041ef1e550797646d5c73b",
-                    "nonce" : "0x6a44380b5f0596e4",
-                    "number" : "0x01",
-                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "0xcb13734c005e3002ab78fe920c93070efe7e2af7b00adc4822c5e58b2634e53b",
-                    "stateRoot" : "0xcf280d7e4bc2b97d88436b961013b0f59f99831f79ede5e72e6a752e45a7c3db",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf280d7e4bc2b97d88436b961013b0f59f99831f79ede5e72e6a752e45a7c3dba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0cb13734c005e3002ab78fe920c93070efe7e2af7b00adc4822c5e58b2634e53bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a007f85caa1998dbcc61434fa4e278bec92715f07d88041ef1e550797646d5c73b886a44380b5f0596e4f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93fd33dea5aef8a31201f6dd03006e78207e11ff33ecb20ce80708ca787fb044",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0.json
index 403233485..7c73e6cbe 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "befbacb68270f2a90d820b5bacfc1a9a273249ad718b6635c32b479511a466f7"
+            "sourceHash" : "5b0df63da5c4b92aa6c406af3e2893b44e484aab0ceacc98bb56548e0e60adbf"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a4",
-                    "hash" : "0x89d1018fe8f504fd5a10c851c3de6754bc7f43f5d561c1892b3a311bcf05efc3",
-                    "mixHash" : "0x27d25c05666537f9d89037cabe27e24641df6226f18ca0ee974d5f949cfcc883",
-                    "nonce" : "0x3c9ed1ac68daf483",
+                    "hash" : "0x50ea8a3f225e7808e878a0275aba85ccbfbdb1b9312aa42b72b1c01a6ca76586",
+                    "mixHash" : "0x64d0efea10a8e96d69e79fd68a50dcfa702893541bc8e6db68da8dc9ffdb2ce4",
+                    "nonce" : "0x796101551fc53804",
                     "number" : "0x01",
                     "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
                     "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098c0ee5ad2f3eaa199097a4f557e66158f431fee3032dafcaab4f28cd5e0dd12a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a027d25c05666537f9d89037cabe27e24641df6226f18ca0ee974d5f949cfcc883883c9ed1ac68daf483f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa098c0ee5ad2f3eaa199097a4f557e66158f431fee3032dafcaab4f28cd5e0dd12a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a064d0efea10a8e96d69e79fd68a50dcfa702893541bc8e6db68da8dc9ffdb2ce488796101551fc53804f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89d1018fe8f504fd5a10c851c3de6754bc7f43f5d561c1892b3a311bcf05efc3",
+        "lastblockhash" : "0x50ea8a3f225e7808e878a0275aba85ccbfbdb1b9312aa42b72b1c01a6ca76586",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "befbacb68270f2a90d820b5bacfc1a9a273249ad718b6635c32b479511a466f7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0x186f09b5ad278060e4c71e67252cb7082e6ad6f06a5860c649f46b68e24f91c2",
-                    "mixHash" : "0x739886d1f16c2d92b3a903476fd746b968cf5d227481fd4c46c7c2a609b03f20",
-                    "nonce" : "0x5843a3d455970bd2",
-                    "number" : "0x01",
-                    "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-                    "receiptTrie" : "0x8316f0fa7b5141820aa0972449e872afc0affdd8422d5b14aa3c070c30c87184",
-                    "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da08316f0fa7b5141820aa0972449e872afc0affdd8422d5b14aa3c070c30c87184b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0739886d1f16c2d92b3a903476fd746b968cf5d227481fd4c46c7c2a609b03f20885843a3d455970bd2f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x74bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x186f09b5ad278060e4c71e67252cb7082e6ad6f06a5860c649f46b68e24f91c2",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "befbacb68270f2a90d820b5bacfc1a9a273249ad718b6635c32b479511a466f7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0xe24d4fb69cbbfe96ef97cea51c7464ceaf41241150c0b8fe94b66e83c9ea9672",
-                    "mixHash" : "0xf91b39b78669cf1ea4d152b40bfda43bce42f83c68d2deb361ec7bc745657c28",
-                    "nonce" : "0x370e941650ab3cde",
-                    "number" : "0x01",
-                    "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-                    "receiptTrie" : "0xbde88e07f7d42ab4a06b75f1182b4888b50ddbb5e7d77f0b2106d1dd38ef53cd",
-                    "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0bde88e07f7d42ab4a06b75f1182b4888b50ddbb5e7d77f0b2106d1dd38ef53cdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0f91b39b78669cf1ea4d152b40bfda43bce42f83c68d2deb361ec7bc745657c2888370e941650ab3cdef865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x74bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe24d4fb69cbbfe96ef97cea51c7464ceaf41241150c0b8fe94b66e83c9ea9672",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput3_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "befbacb68270f2a90d820b5bacfc1a9a273249ad718b6635c32b479511a466f7"
+            "sourceHash" : "5b0df63da5c4b92aa6c406af3e2893b44e484aab0ceacc98bb56548e0e60adbf"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb410",
-                    "hash" : "0x7cf9021245303a9674b5e84d666784fa845f0baf170fd859e9e91c9f8c82e5cb",
-                    "mixHash" : "0x4dee918165e53c2035c6514843e550b85fa2001b0f6f3cbf3e3837ac3399d8cf",
-                    "nonce" : "0x59b4d468c9e46879",
+                    "hash" : "0x933c94814b470d705908047422ffb0c8205e57d6582712611807b74b1b7df2bc",
+                    "mixHash" : "0x30cb9b6051ffe80abf898a22181e885138cc5a130cc39b13666bd4aedf945d79",
+                    "nonce" : "0x4e8ab786af31bb26",
                     "number" : "0x01",
                     "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
                     "receiptTrie" : "0x7f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da07f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a04dee918165e53c2035c6514843e550b85fa2001b0f6f3cbf3e3837ac3399d8cf8859b4d468c9e46879f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da07f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a030cb9b6051ffe80abf898a22181e885138cc5a130cc39b13666bd4aedf945d79884e8ab786af31bb26f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cf9021245303a9674b5e84d666784fa845f0baf170fd859e9e91c9f8c82e5cb",
+        "lastblockhash" : "0x933c94814b470d705908047422ffb0c8205e57d6582712611807b74b1b7df2bc",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callcodeOutput3_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "befbacb68270f2a90d820b5bacfc1a9a273249ad718b6635c32b479511a466f7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb410",
-                    "hash" : "0x36460777b4a16fe57f9c5930b6cae9848d1d40b9c48d7b777c60a383847d261b",
-                    "mixHash" : "0x15540bc5a41b15ab0211013b794b8701585694d379639ea73f5177798f87dc51",
-                    "nonce" : "0xa0a58eb36f970d2b",
-                    "number" : "0x01",
-                    "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-                    "receiptTrie" : "0x7f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7",
-                    "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da07f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a015540bc5a41b15ab0211013b794b8701585694d379639ea73f5177798f87dc5188a0a58eb36f970d2bf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x74bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36460777b4a16fe57f9c5930b6cae9848d1d40b9c48d7b777c60a383847d261b",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0.json
index b42088fd3..7f9945606 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "5da91fb664dcb6d776c6adad073c7fc491bb2ecd60c0bdfe4db535f185eed05c"
+            "sourceHash" : "f927a438312a5f8b4ebbbb2dc198a5da51dfde9b86d93d402d7ca25679949334"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016660",
-                    "hash" : "0x3734791709fef4305c2691ce8ef487ab6e5df880023859ec809ce9cc01d35686",
-                    "mixHash" : "0x263508609b2ab26677cc13a3d52a84ca6eeaa84ebd4b14fa95b3d6fe1c294ba6",
-                    "nonce" : "0x93ab4152e04cd659",
+                    "hash" : "0x276568f6ba8e6d56ea15d5bf735f250382296688ccfb9f6cde192abd13db73de",
+                    "mixHash" : "0x9b9b512310eb81f496288f5d20494319642d1f0ffddc0347570340e80e70769b",
+                    "nonce" : "0xa9522a430e536302",
                     "number" : "0x01",
                     "parentHash" : "0xd3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4",
                     "receiptTrie" : "0x11a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0d3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f00ad010e88ce961afce4585db9d879499627957ccec260117b80eb9a7c79a24a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a0263508609b2ab26677cc13a3d52a84ca6eeaa84ebd4b14fa95b3d6fe1c294ba68893ab4152e04cd659f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90263f901f8a0d3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f00ad010e88ce961afce4585db9d879499627957ccec260117b80eb9a7c79a24a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da011a30ec9dc9ba2fe1d3a16925f92f409c66f9604f9f358d9a281e0efa02f8e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a09b9b512310eb81f496288f5d20494319642d1f0ffddc0347570340e80e70769b88a9522a430e536302f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b90921128600ae05e71b6893d1fed406502c362501a0a883cb5ea7f71a68707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3734791709fef4305c2691ce8ef487ab6e5df880023859ec809ce9cc01d35686",
+        "lastblockhash" : "0x276568f6ba8e6d56ea15d5bf735f250382296688ccfb9f6cde192abd13db73de",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callcodeOutput3partialFail_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "5da91fb664dcb6d776c6adad073c7fc491bb2ecd60c0bdfe4db535f185eed05c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016660",
-                    "hash" : "0x195a5989ef6d4fbc6d8ead128da80719a0886ed9e81abeb259f31e9e257df91d",
-                    "mixHash" : "0x85984eccf315438d12d89ccdf6946c6a0d31717b39092041c6cb18c966373e9d",
-                    "nonce" : "0x2c93c6fa45077df7",
-                    "number" : "0x01",
-                    "parentHash" : "0xd3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4",
-                    "receiptTrie" : "0x9a9c4ce46324c364e458ba970317145707d082b581aa0f3465293976f4ddfac9",
-                    "stateRoot" : "0x19844a73fa3c749ec8f7f68e92fd1c2431ca701a5e2aa8cf8cd51e4843f74a2d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0d3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019844a73fa3c749ec8f7f68e92fd1c2431ca701a5e2aa8cf8cd51e4843f74a2da07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da09a9c4ce46324c364e458ba970317145707d082b581aa0f3465293976f4ddfac9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a085984eccf315438d12d89ccdf6946c6a0d31717b39092041c6cb18c966373e9d882c93c6fa45077df7f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xd3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3b90921128600ae05e71b6893d1fed406502c362501a0a883cb5ea7f71a68707",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b90921128600ae05e71b6893d1fed406502c362501a0a883cb5ea7f71a68707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x195a5989ef6d4fbc6d8ead128da80719a0886ed9e81abeb259f31e9e257df91d",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3partialFail_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "5da91fb664dcb6d776c6adad073c7fc491bb2ecd60c0bdfe4db535f185eed05c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016660",
-                    "hash" : "0xd3df217d3c5c2991effbae15fb64a54878116aab8afcf009770f9c837488e39b",
-                    "mixHash" : "0x4f2ea527dd344be669679b60b9f86c7e57599560a041b731247dae6253a54c34",
-                    "nonce" : "0x4e2dbcf0d51224ec",
-                    "number" : "0x01",
-                    "parentHash" : "0xd3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4",
-                    "receiptTrie" : "0xad25a79e44c3d02485b10fc0f68d058882f37dc492922807ed980cf0f9840a60",
-                    "stateRoot" : "0x19844a73fa3c749ec8f7f68e92fd1c2431ca701a5e2aa8cf8cd51e4843f74a2d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0d3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019844a73fa3c749ec8f7f68e92fd1c2431ca701a5e2aa8cf8cd51e4843f74a2da07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0ad25a79e44c3d02485b10fc0f68d058882f37dc492922807ed980cf0f9840a60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830166608203e880a04f2ea527dd344be669679b60b9f86c7e57599560a041b731247dae6253a54c34884e2dbcf0d51224ecf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xd3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3b90921128600ae05e71b6893d1fed406502c362501a0a883cb5ea7f71a68707",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b90921128600ae05e71b6893d1fed406502c362501a0a883cb5ea7f71a68707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3df217d3c5c2991effbae15fb64a54878116aab8afcf009770f9c837488e39b",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput3partialFail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "5da91fb664dcb6d776c6adad073c7fc491bb2ecd60c0bdfe4db535f185eed05c"
+            "sourceHash" : "f927a438312a5f8b4ebbbb2dc198a5da51dfde9b86d93d402d7ca25679949334"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163cc",
-                    "hash" : "0xfe98a304aedf1d776b45d85e25012a71145089f74138f5980eb6f2bdabead2dd",
-                    "mixHash" : "0x66210172b598228365fdc9aa3fc1aa20dfab8291d54fd72e5023d5352332a2cd",
-                    "nonce" : "0x5ab6385a72e68017",
+                    "hash" : "0xf4fa083a659de21585524ad487755f0dae06e355f936615393605c581859c5d2",
+                    "mixHash" : "0xc2ab1697113680b63f5fa0aad444e38f958654f07f76e9b3abbf89ba26d608d5",
+                    "nonce" : "0x7e0f3540da42381b",
                     "number" : "0x01",
                     "parentHash" : "0xd3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4",
                     "receiptTrie" : "0x0ba5c47ee6a6cd354fdfb8753d67c819ed54e0f9cfed25c0273e59b35ebeb28e",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0d3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019844a73fa3c749ec8f7f68e92fd1c2431ca701a5e2aa8cf8cd51e4843f74a2da07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da00ba5c47ee6a6cd354fdfb8753d67c819ed54e0f9cfed25c0273e59b35ebeb28eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a066210172b598228365fdc9aa3fc1aa20dfab8291d54fd72e5023d5352332a2cd885ab6385a72e68017f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90263f901f8a0d3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019844a73fa3c749ec8f7f68e92fd1c2431ca701a5e2aa8cf8cd51e4843f74a2da07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da00ba5c47ee6a6cd354fdfb8753d67c819ed54e0f9cfed25c0273e59b35ebeb28eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a0c2ab1697113680b63f5fa0aad444e38f958654f07f76e9b3abbf89ba26d608d5887e0f3540da42381bf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b90921128600ae05e71b6893d1fed406502c362501a0a883cb5ea7f71a68707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe98a304aedf1d776b45d85e25012a71145089f74138f5980eb6f2bdabead2dd",
+        "lastblockhash" : "0xf4fa083a659de21585524ad487755f0dae06e355f936615393605c581859c5d2",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callcodeOutput3partialFail_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "5da91fb664dcb6d776c6adad073c7fc491bb2ecd60c0bdfe4db535f185eed05c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0163cc",
-                    "hash" : "0xd5231ffe248e0021c704b1e00ed1cf730b1fc6cc840bd484c6da3871f1c7c5bb",
-                    "mixHash" : "0x815360e4ee056b7cc258e3ea5dc81828aae51cb34c761cef8736fdc49694f714",
-                    "nonce" : "0x010c07084ed44c91",
-                    "number" : "0x01",
-                    "parentHash" : "0xd3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4",
-                    "receiptTrie" : "0x0ba5c47ee6a6cd354fdfb8753d67c819ed54e0f9cfed25c0273e59b35ebeb28e",
-                    "stateRoot" : "0x19844a73fa3c749ec8f7f68e92fd1c2431ca701a5e2aa8cf8cd51e4843f74a2d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0d3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019844a73fa3c749ec8f7f68e92fd1c2431ca701a5e2aa8cf8cd51e4843f74a2da07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da00ba5c47ee6a6cd354fdfb8753d67c819ed54e0f9cfed25c0273e59b35ebeb28eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163cc8203e880a0815360e4ee056b7cc258e3ea5dc81828aae51cb34c761cef8736fdc49694f71488010c07084ed44c91f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xd3d8522ef2b94f3cfc65657673b62e10504d22689ca1caba820630b20a7382e4",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3b90921128600ae05e71b6893d1fed406502c362501a0a883cb5ea7f71a68707",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b90921128600ae05e71b6893d1fed406502c362501a0a883cb5ea7f71a68707a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5231ffe248e0021c704b1e00ed1cf730b1fc6cc840bd484c6da3871f1c7c5bb",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0.json
index da09ab75c..b3a05a901 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "8077c2ec4be549264fc27157fa00f0787a4cc0dc11ebf6ae82fb28cf3d6c3067"
+            "sourceHash" : "38a7ea59d00ff1358686d22d6e8fcaf77dd4e791b5b0e6f4de07073afb94c9ba"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a4",
-                    "hash" : "0x318be3f2b9c9a3369dfa8b4c4c238e68c319f60844ba0e4b834e0fa531cb0f31",
-                    "mixHash" : "0xd3426d891baa27ba1221ca97733d090a3fd9ed7e595d5d935590519f06cd95ed",
-                    "nonce" : "0xbb08e46fa5deb41f",
+                    "hash" : "0xe1811cc8cd7fc48a0aee4270c4a75aa63822a4e3d0eb744ab531f04a822becf0",
+                    "mixHash" : "0x525c222daa7e6c9037bcf97b16714e0890b84e2456affaffce26f018aaf48718",
+                    "nonce" : "0xb0d414b6ad37747d",
                     "number" : "0x01",
                     "parentHash" : "0x40c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35",
                     "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a040c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1fccbe6551c8f2d612990be0922566a9277c5b6be3b754494503060e4288d39a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0d3426d891baa27ba1221ca97733d090a3fd9ed7e595d5d935590519f06cd95ed88bb08e46fa5deb41ff865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a040c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1fccbe6551c8f2d612990be0922566a9277c5b6be3b754494503060e4288d39a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0525c222daa7e6c9037bcf97b16714e0890b84e2456affaffce26f018aaf4871888b0d414b6ad37747df865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07664eb567babe468a362b08bf59ea50b885485879dcb1501d3cfd480c10735c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x318be3f2b9c9a3369dfa8b4c4c238e68c319f60844ba0e4b834e0fa531cb0f31",
+        "lastblockhash" : "0xe1811cc8cd7fc48a0aee4270c4a75aa63822a4e3d0eb744ab531f04a822becf0",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,257 +121,13 @@
             }
         }
     },
-    "callcodeOutput3partial_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "8077c2ec4be549264fc27157fa00f0787a4cc0dc11ebf6ae82fb28cf3d6c3067"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0x22819d3e3bf6fa55f9159b96104bb103a67b38c8c0ba3ec5039346cd0575bc84",
-                    "mixHash" : "0x86ec99db9b23dd6d8424936d08eabbf6e4dced2a2ab94e6d1db7d895c9cb3850",
-                    "nonce" : "0xdeb50fe342cf7bc7",
-                    "number" : "0x01",
-                    "parentHash" : "0x40c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35",
-                    "receiptTrie" : "0x1395a7d8552f75c2d3e0b2e7a1a0431c4a74dc949d639b4cb2d6f7b7d10aa3bd",
-                    "stateRoot" : "0x0e2840661b71abdc86d8596f1a54f218cb659efe0009903ca1c28f60a7a5fbf4",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a040c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e2840661b71abdc86d8596f1a54f218cb659efe0009903ca1c28f60a7a5fbf4a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da01395a7d8552f75c2d3e0b2e7a1a0431c4a74dc949d639b4cb2d6f7b7d10aa3bdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a086ec99db9b23dd6d8424936d08eabbf6e4dced2a2ab94e6d1db7d895c9cb385088deb50fe342cf7bc7f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x40c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7664eb567babe468a362b08bf59ea50b885485879dcb1501d3cfd480c10735c6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07664eb567babe468a362b08bf59ea50b885485879dcb1501d3cfd480c10735c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22819d3e3bf6fa55f9159b96104bb103a67b38c8c0ba3ec5039346cd0575bc84",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3partial_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "8077c2ec4be549264fc27157fa00f0787a4cc0dc11ebf6ae82fb28cf3d6c3067"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0x5d4a061fcba20dc004f277466ac7c325ea32ddee3ee3e6b7662d4b3e81817841",
-                    "mixHash" : "0x262af3b64ffe092076508827e81d78111232fec49511ac06369fb153c5e021e0",
-                    "nonce" : "0x09e75f5746399d0d",
-                    "number" : "0x01",
-                    "parentHash" : "0x40c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35",
-                    "receiptTrie" : "0x03916ca8961727a469a999c764cc842d75a3087892eaf6d167eca4d8dc17c676",
-                    "stateRoot" : "0x0e2840661b71abdc86d8596f1a54f218cb659efe0009903ca1c28f60a7a5fbf4",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a040c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e2840661b71abdc86d8596f1a54f218cb659efe0009903ca1c28f60a7a5fbf4a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da003916ca8961727a469a999c764cc842d75a3087892eaf6d167eca4d8dc17c676b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0262af3b64ffe092076508827e81d78111232fec49511ac06369fb153c5e021e08809e75f5746399d0df865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x40c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7664eb567babe468a362b08bf59ea50b885485879dcb1501d3cfd480c10735c6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07664eb567babe468a362b08bf59ea50b885485879dcb1501d3cfd480c10735c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d4a061fcba20dc004f277466ac7c325ea32ddee3ee3e6b7662d4b3e81817841",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput3partial_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "8077c2ec4be549264fc27157fa00f0787a4cc0dc11ebf6ae82fb28cf3d6c3067"
+            "sourceHash" : "38a7ea59d00ff1358686d22d6e8fcaf77dd4e791b5b0e6f4de07073afb94c9ba"
         },
         "blocks" : [
             {
@@ -382,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb410",
-                    "hash" : "0x221d4e254f46dad55730ccb1eb0478cd4d32d8530bacb486cda4d3722d086988",
-                    "mixHash" : "0x2f9620515c74068c9d58c328f101a3e536fc339fc06c78f9365b681e460b8513",
-                    "nonce" : "0x18c512c5420d14e8",
+                    "hash" : "0x618134079b76781fc8c74b71aa64720bc1ee5fb09e28fc2e334fe657c060e60c",
+                    "mixHash" : "0x1dfe7e8e60c9a72a3abdb57e1badb3c83fb9d45a207ca9577a1fdc67f5d63f3b",
+                    "nonce" : "0x4d96b07d83248b19",
                     "number" : "0x01",
                     "parentHash" : "0x40c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35",
                     "receiptTrie" : "0x4b4c47f2bb64275ea2f0e04f8d470d683cab67994ef0f3d47e3a5078c76748a5",
@@ -393,10 +149,10 @@
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a040c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e2840661b71abdc86d8596f1a54f218cb659efe0009903ca1c28f60a7a5fbf4a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da04b4c47f2bb64275ea2f0e04f8d470d683cab67994ef0f3d47e3a5078c76748a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a02f9620515c74068c9d58c328f101a3e536fc339fc06c78f9365b681e460b85138818c512c5420d14e8f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a040c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e2840661b71abdc86d8596f1a54f218cb659efe0009903ca1c28f60a7a5fbf4a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da04b4c47f2bb64275ea2f0e04f8d470d683cab67994ef0f3d47e3a5078c76748a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a01dfe7e8e60c9a72a3abdb57e1badb3c83fb9d45a207ca9577a1fdc67f5d63f3b884d96b07d83248b19f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -430,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07664eb567babe468a362b08bf59ea50b885485879dcb1501d3cfd480c10735c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x221d4e254f46dad55730ccb1eb0478cd4d32d8530bacb486cda4d3722d086988",
+        "lastblockhash" : "0x618134079b76781fc8c74b71aa64720bc1ee5fb09e28fc2e334fe657c060e60c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -486,127 +242,5 @@
                 }
             }
         }
-    },
-    "callcodeOutput3partial_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "8077c2ec4be549264fc27157fa00f0787a4cc0dc11ebf6ae82fb28cf3d6c3067"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb410",
-                    "hash" : "0xd525574cb7aae436ebfc232972742ce0a85b4328886668ccc4cdee335388c047",
-                    "mixHash" : "0xeb219ae64b496d20b3dfd76b13c83e787d63a2cbb06a74d83729bb781511663a",
-                    "nonce" : "0xc41386490e32f1be",
-                    "number" : "0x01",
-                    "parentHash" : "0x40c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35",
-                    "receiptTrie" : "0x4b4c47f2bb64275ea2f0e04f8d470d683cab67994ef0f3d47e3a5078c76748a5",
-                    "stateRoot" : "0x0e2840661b71abdc86d8596f1a54f218cb659efe0009903ca1c28f60a7a5fbf4",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a040c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e2840661b71abdc86d8596f1a54f218cb659efe0009903ca1c28f60a7a5fbf4a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da04b4c47f2bb64275ea2f0e04f8d470d683cab67994ef0f3d47e3a5078c76748a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a0eb219ae64b496d20b3dfd76b13c83e787d63a2cbb06a74d83729bb781511663a88c41386490e32f1bef865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0f4240",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
-                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x40c9ce91be0e54ace208ca6a275c8c9b4aae47cc4d25b7f9ca74229f6a9f5d35",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7664eb567babe468a362b08bf59ea50b885485879dcb1501d3cfd480c10735c6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07664eb567babe468a362b08bf59ea50b885485879dcb1501d3cfd480c10735c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd525574cb7aae436ebfc232972742ce0a85b4328886668ccc4cdee335388c047",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0.json
index 34873031d..70d344c5d 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "9ac217259f32190016bb307d169e517f308f35eae6414dda61010d12b232e54f"
+            "sourceHash" : "d3d9b6da352a9ac3b4aaa4a0ea75b70fb55d8f46519047c48a24d75f30c9613f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x82a8",
-                    "hash" : "0x670c5ec6a43c500807d8d08ac08d5acc101c8873d1b9c98a2a356b09bc8606e8",
-                    "mixHash" : "0x60e416749cb0b5c762317b91ee3f71ae3ecabb82bc28d7f4ec20f25d14b5445b",
-                    "nonce" : "0x8427665586121329",
+                    "hash" : "0xa2f140bf2ecdbb6197ea4e3a338c93f4e2e579c65f40fd823ab18b8117d65afe",
+                    "mixHash" : "0xb0bbf5875f24b0934f17595fd1e5b2e14f70e704ed6346a0693325d20524e9fb",
+                    "nonce" : "0x7c9e66bd79296912",
                     "number" : "0x01",
                     "parentHash" : "0x9fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2",
                     "receiptTrie" : "0x3fd5f8f60ddb1df4119a511223bc7c9bb9e1ddb36488791c073a4d960e29c92d",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a09fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0342f6a6c742f9670c5b14451020d644cd092124ec525ac88d2b724d9b8f19087a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da03fd5f8f60ddb1df4119a511223bc7c9bb9e1ddb36488791c073a4d960e29c92db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282a88203e880a060e416749cb0b5c762317b91ee3f71ae3ecabb82bc28d7f4ec20f25d14b5445b888427665586121329f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a09fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0342f6a6c742f9670c5b14451020d644cd092124ec525ac88d2b724d9b8f19087a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da03fd5f8f60ddb1df4119a511223bc7c9bb9e1ddb36488791c073a4d960e29c92db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282a88203e880a0b0bbf5875f24b0934f17595fd1e5b2e14f70e704ed6346a0693325d20524e9fb887c9e66bd79296912f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063f664a5a1b2c075cee513c686d1d9b939b09353a43b3a2ac30a6c918dbebb7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x670c5ec6a43c500807d8d08ac08d5acc101c8873d1b9c98a2a356b09bc8606e8",
+        "lastblockhash" : "0xa2f140bf2ecdbb6197ea4e3a338c93f4e2e579c65f40fd823ab18b8117d65afe",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,255 +120,13 @@
             }
         }
     },
-    "callcodeWithHighValueAndGasOOG_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "9ac217259f32190016bb307d169e517f308f35eae6414dda61010d12b232e54f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x82a8",
-                    "hash" : "0x351cf3694425746b99b13c25e0a4a608505d3762216123c2c4d389a66f52c6f4",
-                    "mixHash" : "0x13146284dfa947fe5d5b2f5784ef551c9f479bc76f12cf90011075a0da074b4a",
-                    "nonce" : "0x2227e283645dc94e",
-                    "number" : "0x01",
-                    "parentHash" : "0x9fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2",
-                    "receiptTrie" : "0x3e7708781b135560f70a0327ead4ef6b26a887f8bdf19f51174e911d8075c769",
-                    "stateRoot" : "0x90ff3659254f9c5662874be16bad2833ad3ea0ddbdd41fa7ffccb219a83cbe0d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a09fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090ff3659254f9c5662874be16bad2833ad3ea0ddbdd41fa7ffccb219a83cbe0da0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da03e7708781b135560f70a0327ead4ef6b26a887f8bdf19f51174e911d8075c769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282a88203e880a013146284dfa947fe5d5b2f5784ef551c9f479bc76f12cf90011075a0da074b4a882227e283645dc94ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x063f664a5a1b2c075cee513c686d1d9b939b09353a43b3a2ac30a6c918dbebb7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063f664a5a1b2c075cee513c686d1d9b939b09353a43b3a2ac30a6c918dbebb7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x351cf3694425746b99b13c25e0a4a608505d3762216123c2c4d389a66f52c6f4",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f482a8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761f6b8",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeWithHighValueAndGasOOG_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "9ac217259f32190016bb307d169e517f308f35eae6414dda61010d12b232e54f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x82a8",
-                    "hash" : "0x46bd7e872ea58597b79b170038a67bb3b96fc900e9eee6eb757e302a2215608d",
-                    "mixHash" : "0x23805f10768d6a4c75ebbed7209ceee66e53082d8c7feead509786eca9c58ef7",
-                    "nonce" : "0xb935e8fa291362a5",
-                    "number" : "0x01",
-                    "parentHash" : "0x9fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2",
-                    "receiptTrie" : "0x3e7708781b135560f70a0327ead4ef6b26a887f8bdf19f51174e911d8075c769",
-                    "stateRoot" : "0x90ff3659254f9c5662874be16bad2833ad3ea0ddbdd41fa7ffccb219a83cbe0d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a09fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090ff3659254f9c5662874be16bad2833ad3ea0ddbdd41fa7ffccb219a83cbe0da0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da03e7708781b135560f70a0327ead4ef6b26a887f8bdf19f51174e911d8075c769b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282a88203e880a023805f10768d6a4c75ebbed7209ceee66e53082d8c7feead509786eca9c58ef788b935e8fa291362a5f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x063f664a5a1b2c075cee513c686d1d9b939b09353a43b3a2ac30a6c918dbebb7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063f664a5a1b2c075cee513c686d1d9b939b09353a43b3a2ac30a6c918dbebb7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46bd7e872ea58597b79b170038a67bb3b96fc900e9eee6eb757e302a2215608d",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f482a8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761f6b8",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "9ac217259f32190016bb307d169e517f308f35eae6414dda61010d12b232e54f"
+            "sourceHash" : "d3d9b6da352a9ac3b4aaa4a0ea75b70fb55d8f46519047c48a24d75f30c9613f"
         },
         "blocks" : [
             {
@@ -379,9 +137,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x44865bda1f86c1201ccab16907289093cac88210db9be2090ef723c2df051685",
-                    "mixHash" : "0xb90fa29875634637690d90b646a7ce6a938998ea965e03b9ee7d19f4a9cd826b",
-                    "nonce" : "0xb69d1c44477eebd2",
+                    "hash" : "0xec63d1b10a54ae19f08807e7404477535d2732c89287f60d75723d12f39411d9",
+                    "mixHash" : "0xcec82a2720db567595d3370e5f283d59851cc735d52674b11cd3e052d7bf35d9",
+                    "nonce" : "0x3c9b4157b42a0cc0",
                     "number" : "0x01",
                     "parentHash" : "0x9fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2",
                     "receiptTrie" : "0x8e72cea431c652c22038352d64b33405dcbecc0365f4c0a87ed0d37b8fc55a23",
@@ -390,10 +148,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a09fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00bd5fb57f986e4d590a43f8a1d4c928e7a4f1ad3681520a65d5e7eaaca6d7069a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da08e72cea431c652c22038352d64b33405dcbecc0365f4c0a87ed0d37b8fc55a23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0b90fa29875634637690d90b646a7ce6a938998ea965e03b9ee7d19f4a9cd826b88b69d1c44477eebd2f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a09fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00bd5fb57f986e4d590a43f8a1d4c928e7a4f1ad3681520a65d5e7eaaca6d7069a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da08e72cea431c652c22038352d64b33405dcbecc0365f4c0a87ed0d37b8fc55a23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0cec82a2720db567595d3370e5f283d59851cc735d52674b11cd3e052d7bf35d9883c9b4157b42a0cc0f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -427,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063f664a5a1b2c075cee513c686d1d9b939b09353a43b3a2ac30a6c918dbebb7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44865bda1f86c1201ccab16907289093cac88210db9be2090ef723c2df051685",
+        "lastblockhash" : "0xec63d1b10a54ae19f08807e7404477535d2732c89287f60d75723d12f39411d9",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -482,126 +240,5 @@
                 }
             }
         }
-    },
-    "callcodeWithHighValueAndGasOOG_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "9ac217259f32190016bb307d169e517f308f35eae6414dda61010d12b232e54f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x77332c51b42c69411766da6630b8cdc4464aad2f3875938eac0c11f6f56972d4",
-                    "mixHash" : "0x9dacee9bdf4d4f0e59ba3a705c0e3c5fd7f68f10126a90c69f4d59510abfb58e",
-                    "nonce" : "0xae1679b54e5e26d4",
-                    "number" : "0x01",
-                    "parentHash" : "0x9fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2",
-                    "receiptTrie" : "0x8e72cea431c652c22038352d64b33405dcbecc0365f4c0a87ed0d37b8fc55a23",
-                    "stateRoot" : "0x0bd5fb57f986e4d590a43f8a1d4c928e7a4f1ad3681520a65d5e7eaaca6d7069",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f9a09fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00bd5fb57f986e4d590a43f8a1d4c928e7a4f1ad3681520a65d5e7eaaca6d7069a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da08e72cea431c652c22038352d64b33405dcbecc0365f4c0a87ed0d37b8fc55a23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a09dacee9bdf4d4f0e59ba3a705c0e3c5fd7f68f10126a90c69f4d59510abfb58e88ae1679b54e5e26d4f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9fb9c208a7c98ddf2886ec1169d4ff6adccf9ee1f5fe23ba64312de6f87125f2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x063f664a5a1b2c075cee513c686d1d9b939b09353a43b3a2ac30a6c918dbebb7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0063f664a5a1b2c075cee513c686d1d9b939b09353a43b3a2ac30a6c918dbebb7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77332c51b42c69411766da6630b8cdc4464aad2f3875938eac0c11f6f56972d4",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600068056bc75e2d6310000073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0.json
index 9a5e5ae4d..341ebebd5 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValue_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "9498b0e0fe6662c0a882de34dd997c0326fcabfa21ec2e7fd28cde5de5e3e835"
+            "sourceHash" : "192a4c2ed3c41f84a28e50bfeed39e90c83601b5346ea38a028449b48bbd0992"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x8296",
-                    "hash" : "0x08008cafa3ca25eaa2fa0d1e7c97e2b3a6a4878313d453dd2bf764f2d1dd80f3",
-                    "mixHash" : "0x1a25ea1b89bb90a17280faae2ea3b06c60762e8b8b6b66ea526b5cf925e089d4",
-                    "nonce" : "0x59e107edf450dcc9",
+                    "hash" : "0x60b6c5b7bbbdaf42fd2a5ed4cf4f40c641ff47460a5167bee21c19457fc376db",
+                    "mixHash" : "0x26616f3e90655517c0394de50026e90b75192eea6a93cda6ad5fb6e1b6e1801b",
+                    "nonce" : "0x37c92527f54ad93b",
                     "number" : "0x01",
                     "parentHash" : "0xcb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9f",
                     "receiptTrie" : "0x57bdfca4e37287ae76f4783a657dd2bdc215b8f6ff5f860041d573f0be2c7e8f",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e627c10ebfb43391e9efb332d3fd742db2138e87c6b3e37b65787b284d711f3ca03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a057bdfca4e37287ae76f4783a657dd2bdc215b8f6ff5f860041d573f0be2c7e8fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282968203e880a01a25ea1b89bb90a17280faae2ea3b06c60762e8b8b6b66ea526b5cf925e089d48859e107edf450dcc9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0cb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e627c10ebfb43391e9efb332d3fd742db2138e87c6b3e37b65787b284d711f3ca03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a057bdfca4e37287ae76f4783a657dd2bdc215b8f6ff5f860041d573f0be2c7e8fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282968203e880a026616f3e90655517c0394de50026e90b75192eea6a93cda6ad5fb6e1b6e1801b8837c92527f54ad93bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1135ab32107e3ae8d27c8188d8ad70103ccfdc3fc9859ea39766cbeca410391a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08008cafa3ca25eaa2fa0d1e7c97e2b3a6a4878313d453dd2bf764f2d1dd80f3",
+        "lastblockhash" : "0x60b6c5b7bbbdaf42fd2a5ed4cf4f40c641ff47460a5167bee21c19457fc376db",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -120,255 +120,13 @@
             }
         }
     },
-    "callcodeWithHighValue_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/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "9498b0e0fe6662c0a882de34dd997c0326fcabfa21ec2e7fd28cde5de5e3e835"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8296",
-                    "hash" : "0x175271dd28af173962ddec885788f75df08c46ecb228f1fe5ca87a0090288a9d",
-                    "mixHash" : "0xc594db141288afb522820688a095842cd4df565aa9e4da23688db76a73307a2c",
-                    "nonce" : "0xee64871f92766298",
-                    "number" : "0x01",
-                    "parentHash" : "0xcb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9f",
-                    "receiptTrie" : "0x14a8648f58d2a28ee24087c55e892c0c5dd7ddddab5cbfe389c8de0205ca2c13",
-                    "stateRoot" : "0x14189f23157fa48d767fa63cc7987a760cb15427c526e8543359331ed9eb9f07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0cb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014189f23157fa48d767fa63cc7987a760cb15427c526e8543359331ed9eb9f07a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a014a8648f58d2a28ee24087c55e892c0c5dd7ddddab5cbfe389c8de0205ca2c13b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282968203e880a0c594db141288afb522820688a095842cd4df565aa9e4da23688db76a73307a2c88ee64871f92766298f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xcb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe1135ab32107e3ae8d27c8188d8ad70103ccfdc3fc9859ea39766cbeca410391",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1135ab32107e3ae8d27c8188d8ad70103ccfdc3fc9859ea39766cbeca410391a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x175271dd28af173962ddec885788f75df08c46ecb228f1fe5ca87a0090288a9d",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48296",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637d6a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeWithHighValue_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/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "9498b0e0fe6662c0a882de34dd997c0326fcabfa21ec2e7fd28cde5de5e3e835"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8296",
-                    "hash" : "0x3e697137934a22dd418d89bb97e28efe9a83b0453511e4e0537b7b6d8a7b7121",
-                    "mixHash" : "0x528e6aa38af437049538928f7d32d45123f00f33063e22f0cda7d1f842b9a2c8",
-                    "nonce" : "0x1256e527dfb06bf1",
-                    "number" : "0x01",
-                    "parentHash" : "0xcb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9f",
-                    "receiptTrie" : "0x14a8648f58d2a28ee24087c55e892c0c5dd7ddddab5cbfe389c8de0205ca2c13",
-                    "stateRoot" : "0x14189f23157fa48d767fa63cc7987a760cb15427c526e8543359331ed9eb9f07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0cb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014189f23157fa48d767fa63cc7987a760cb15427c526e8543359331ed9eb9f07a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a014a8648f58d2a28ee24087c55e892c0c5dd7ddddab5cbfe389c8de0205ca2c13b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808282968203e880a0528e6aa38af437049538928f7d32d45123f00f33063e22f0cda7d1f842b9a2c8881256e527dfb06bf1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xcb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe1135ab32107e3ae8d27c8188d8ad70103ccfdc3fc9859ea39766cbeca410391",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1135ab32107e3ae8d27c8188d8ad70103ccfdc3fc9859ea39766cbeca410391a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e697137934a22dd418d89bb97e28efe9a83b0453511e4e0537b7b6d8a7b7121",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48296",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637d6a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeWithHighValue_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "9498b0e0fe6662c0a882de34dd997c0326fcabfa21ec2e7fd28cde5de5e3e835"
+            "sourceHash" : "192a4c2ed3c41f84a28e50bfeed39e90c83601b5346ea38a028449b48bbd0992"
         },
         "blocks" : [
             {
@@ -379,9 +137,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x8002",
-                    "hash" : "0x67691c3a44c0feb2f99fe9831eb70d31da79622d38d64bd89526724ec6b68d90",
-                    "mixHash" : "0xdd161a5e2bb658ed551da605f0fe9264d04d851e5505e57978a928bdb1788990",
-                    "nonce" : "0xe7f2a056a4ab4e4a",
+                    "hash" : "0x1d47dd59988db6e53d9d9bd86dc22690b556b7abdc717d3e0ea824a9f39486ab",
+                    "mixHash" : "0x33df715dda79e55cad054692bd8ea009312f6b52534c898859a78892139c0568",
+                    "nonce" : "0x3187405dbcbabc99",
                     "number" : "0x01",
                     "parentHash" : "0xcb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9f",
                     "receiptTrie" : "0x578611067234d7af64936c53fe37448e82d6c5f213a9d4086e13ccf07c2b49be",
@@ -390,10 +148,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06617b1e4f3723b81982a9406925a4194760bbb786b7ab9eea17af568d9f97728a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0578611067234d7af64936c53fe37448e82d6c5f213a9d4086e13ccf07c2b49beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808280028203e880a0dd161a5e2bb658ed551da605f0fe9264d04d851e5505e57978a928bdb178899088e7f2a056a4ab4e4af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0cb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06617b1e4f3723b81982a9406925a4194760bbb786b7ab9eea17af568d9f97728a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0578611067234d7af64936c53fe37448e82d6c5f213a9d4086e13ccf07c2b49beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808280028203e880a033df715dda79e55cad054692bd8ea009312f6b52534c898859a78892139c0568883187405dbcbabc99f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -427,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1135ab32107e3ae8d27c8188d8ad70103ccfdc3fc9859ea39766cbeca410391a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67691c3a44c0feb2f99fe9831eb70d31da79622d38d64bd89526724ec6b68d90",
+        "lastblockhash" : "0x1d47dd59988db6e53d9d9bd86dc22690b556b7abdc717d3e0ea824a9f39486ab",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -482,126 +240,5 @@
                 }
             }
         }
-    },
-    "callcodeWithHighValue_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json",
-            "sourceHash" : "9498b0e0fe6662c0a882de34dd997c0326fcabfa21ec2e7fd28cde5de5e3e835"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x8002",
-                    "hash" : "0x0090707487b07a01ff8b1a1773887d2c87ed9d567d664efee694fb8bfe34e2ff",
-                    "mixHash" : "0xa648a1719981148a5a97f684c7e4358f14f26f2903a3ed3a23c5634961d01d81",
-                    "nonce" : "0x026b76e03dddd0aa",
-                    "number" : "0x01",
-                    "parentHash" : "0xcb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9f",
-                    "receiptTrie" : "0x578611067234d7af64936c53fe37448e82d6c5f213a9d4086e13ccf07c2b49be",
-                    "stateRoot" : "0x6617b1e4f3723b81982a9406925a4194760bbb786b7ab9eea17af568d9f97728",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0cb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06617b1e4f3723b81982a9406925a4194760bbb786b7ab9eea17af568d9f97728a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0578611067234d7af64936c53fe37448e82d6c5f213a9d4086e13ccf07c2b49beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808280028203e880a0a648a1719981148a5a97f684c7e4358f14f26f2903a3ed3a23c5634961d01d8188026b76e03dddd0aaf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xcb30e57df38f7d273a18351b5dbad33bcc7285600f0cfe636d274013d32cfc9f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe1135ab32107e3ae8d27c8188d8ad70103ccfdc3fc9859ea39766cbeca410391",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1135ab32107e3ae8d27c8188d8ad70103ccfdc3fc9859ea39766cbeca410391a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0090707487b07a01ff8b1a1773887d2c87ed9d567d664efee694fb8bfe34e2ff",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f48002",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7637ffe",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6002600060406000670de0b6b3a764000173945304eb96065b2a98b57a48a06ae28d285a71b561c350f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0.json
index b46645ee9..a4ddce95b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0.json
@@ -2,10 +2,10 @@
     "createFailBalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6a2779b8eeebb0a05d35f51b9e845400ae6d29e6a5af78876d4c8a1f5ed37d52"
+            "sourceHash" : "edfc4120c68bd107225d98a3c8325fc7ef0a2489c5b10131f0ddcfa0ffdcca36"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf1d",
-                    "hash" : "0x009311d67f371561ac445642ae70070366d1b21088f560f71d3956e119246e37",
-                    "mixHash" : "0x1864afa579b2bfe578811dfb96b81ad7dc6ef82703637dbd21eea137c7ab0a26",
-                    "nonce" : "0x69eec817ac0f4c44",
+                    "hash" : "0x419b0f39da903269455f56d7d495716b54c1acc5f8472fb651b119cb19cf535c",
+                    "mixHash" : "0x2f663ffd05a2013e5dabd29ed6f6532f04407734c4c7f976f42d73dcd7129f6a",
+                    "nonce" : "0xf574eb4509babc83",
                     "number" : "0x01",
                     "parentHash" : "0xef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8a",
                     "receiptTrie" : "0x00b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xb9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0ef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099994bd023948af6a4e4106fdeb75d51b5b95e7920561dbcab830500f62933c8a0b9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544a000b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1d8203e880a01864afa579b2bfe578811dfb96b81ad7dc6ef82703637dbd21eea137c7ab0a268869eec817ac0f4c44f861f85f800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca0eab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cda043d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0cc0",
+                "rlp" : "0xf9025ff901f8a0ef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099994bd023948af6a4e4106fdeb75d51b5b95e7920561dbcab830500f62933c8a0b9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544a000b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1d8203e880a02f663ffd05a2013e5dabd29ed6f6532f04407734c4c7f976f42d73dcd7129f6a88f574eb4509babc83f861f85f800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca0eab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cda043d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0cc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ccb0c4ed8bebbe743112c67416ed1c59fdad42dfa0ac2a3cf47ae2bb4aeba61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x009311d67f371561ac445642ae70070366d1b21088f560f71d3956e119246e37",
+        "lastblockhash" : "0x419b0f39da903269455f56d7d495716b54c1acc5f8472fb651b119cb19cf535c",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createFailBalanceTooLow_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/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6a2779b8eeebb0a05d35f51b9e845400ae6d29e6a5af78876d4c8a1f5ed37d52"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xcf1d",
-                    "hash" : "0x537ca6bfa97b6ac586b1a63f7a54d6327f57d028506a336b466ebfb9b64664a2",
-                    "mixHash" : "0xe756101467a434faac4328f7421f39debe934d8aebabc593ef94e257f9c124c5",
-                    "nonce" : "0x4bda41b533a79052",
-                    "number" : "0x01",
-                    "parentHash" : "0xef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8a",
-                    "receiptTrie" : "0xf3cad313855606752e420b2cb5443a211ab0e343827bf82aa3584688232ca279",
-                    "stateRoot" : "0x2b6e0f3b883465d535151624e35f068b5d66f767ea8205455585411f8dd25d8b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f8a0ef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6e0f3b883465d535151624e35f068b5d66f767ea8205455585411f8dd25d8ba0b9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544a0f3cad313855606752e420b2cb5443a211ab0e343827bf82aa3584688232ca279b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1d8203e880a0e756101467a434faac4328f7421f39debe934d8aebabc593ef94e257f9c124c5884bda41b533a79052f861f85f800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca0eab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cda043d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0cc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1d",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xeab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cd",
-                        "s" : "0x43d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0c",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x17"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9ccb0c4ed8bebbe743112c67416ed1c59fdad42dfa0ac2a3cf47ae2bb4aeba61",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ccb0c4ed8bebbe743112c67416ed1c59fdad42dfa0ac2a3cf47ae2bb4aeba61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x537ca6bfa97b6ac586b1a63f7a54d6327f57d028506a336b466ebfb9b64664a2",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a60005360016000670de0b6b3a7640018f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf1d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76330e3",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a60005360016000670de0b6b3a7640018f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createFailBalanceTooLow_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/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6a2779b8eeebb0a05d35f51b9e845400ae6d29e6a5af78876d4c8a1f5ed37d52"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xcf1d",
-                    "hash" : "0x9b2bb7abc5a00ce1cf772b6399aac5161230c26f67ab675d8c7a311fa57f85ad",
-                    "mixHash" : "0x1069ec852112f07b760aa3ed896e0b08bc258899428ba6af67d87ecb89898d31",
-                    "nonce" : "0x5244bba8ba86a8d8",
-                    "number" : "0x01",
-                    "parentHash" : "0xef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8a",
-                    "receiptTrie" : "0xf3cad313855606752e420b2cb5443a211ab0e343827bf82aa3584688232ca279",
-                    "stateRoot" : "0x2b6e0f3b883465d535151624e35f068b5d66f767ea8205455585411f8dd25d8b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f8a0ef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b6e0f3b883465d535151624e35f068b5d66f767ea8205455585411f8dd25d8ba0b9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544a0f3cad313855606752e420b2cb5443a211ab0e343827bf82aa3584688232ca279b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1d8203e880a01069ec852112f07b760aa3ed896e0b08bc258899428ba6af67d87ecb89898d31885244bba8ba86a8d8f861f85f800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca0eab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cda043d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0cc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1d",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xeab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cd",
-                        "s" : "0x43d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0c",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x17"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9ccb0c4ed8bebbe743112c67416ed1c59fdad42dfa0ac2a3cf47ae2bb4aeba61",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ccb0c4ed8bebbe743112c67416ed1c59fdad42dfa0ac2a3cf47ae2bb4aeba61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b2bb7abc5a00ce1cf772b6399aac5161230c26f67ab675d8c7a311fa57f85ad",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a60005360016000670de0b6b3a7640018f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf1d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76330e3",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a60005360016000670de0b6b3a7640018f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createFailBalanceTooLow_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6a2779b8eeebb0a05d35f51b9e845400ae6d29e6a5af78876d4c8a1f5ed37d52"
+            "sourceHash" : "edfc4120c68bd107225d98a3c8325fc7ef0a2489c5b10131f0ddcfa0ffdcca36"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x715d",
-                    "hash" : "0x407ac7f011e5f28f1c22e89fb0922afc9dbe65b9df3dee073497740e89ae652a",
-                    "mixHash" : "0xe6022904fa6eca41e5bbcc0e0a1f39f840542f373241fe7229bc7425ee3605d0",
-                    "nonce" : "0x437bdf4c9e8a1613",
+                    "hash" : "0xffc4775b1dc45cb9cfaea101ca90d6403e22dc7a9db727ff5935ef62b634e9cb",
+                    "mixHash" : "0xc35336d68006e68e21f3aaa28ee11902d17751a2aa115089618e9d0f7ca555cc",
+                    "nonce" : "0x44096723071f7bda",
                     "number" : "0x01",
                     "parentHash" : "0xef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8a",
                     "receiptTrie" : "0xad9034be61ccac4ed34dd3704c9e61fbd180435e22a8b193e1efc5d2400260aa",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0xb9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f8a0ef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df1cc3e9a9cb749e69a01fedb35fddcf5f54bcec1406125977eac23f9381a886a0b9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544a0ad9034be61ccac4ed34dd3704c9e61fbd180435e22a8b193e1efc5d2400260aab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082715d8203e880a0e6022904fa6eca41e5bbcc0e0a1f39f840542f373241fe7229bc7425ee3605d088437bdf4c9e8a1613f861f85f800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca0eab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cda043d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0cc0",
+                "rlp" : "0xf9025ff901f8a0ef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df1cc3e9a9cb749e69a01fedb35fddcf5f54bcec1406125977eac23f9381a886a0b9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544a0ad9034be61ccac4ed34dd3704c9e61fbd180435e22a8b193e1efc5d2400260aab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082715d8203e880a0c35336d68006e68e21f3aaa28ee11902d17751a2aa115089618e9d0f7ca555cc8844096723071f7bdaf861f85f800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca0eab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cda043d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0cc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ccb0c4ed8bebbe743112c67416ed1c59fdad42dfa0ac2a3cf47ae2bb4aeba61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x407ac7f011e5f28f1c22e89fb0922afc9dbe65b9df3dee073497740e89ae652a",
+        "lastblockhash" : "0xffc4775b1dc45cb9cfaea101ca90d6403e22dc7a9db727ff5935ef62b634e9cb",
         "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createFailBalanceTooLow_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6a2779b8eeebb0a05d35f51b9e845400ae6d29e6a5af78876d4c8a1f5ed37d52"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x715d",
-                    "hash" : "0x5684a79be37e49b62aec5b837e4a81d96912e5d4779576bb4b1674a37ff83591",
-                    "mixHash" : "0x94060d33845bfae28224b9f4bebca1ce74cea6979fb7ef9fe21a425ba7422d54",
-                    "nonce" : "0x5cfd860e25b812df",
-                    "number" : "0x01",
-                    "parentHash" : "0xef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8a",
-                    "receiptTrie" : "0xad9034be61ccac4ed34dd3704c9e61fbd180435e22a8b193e1efc5d2400260aa",
-                    "stateRoot" : "0xdf1cc3e9a9cb749e69a01fedb35fddcf5f54bcec1406125977eac23f9381a886",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f8a0ef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df1cc3e9a9cb749e69a01fedb35fddcf5f54bcec1406125977eac23f9381a886a0b9bf574604a1e0ffbae835310ec9467f0cf530bf8944d4df39bf78186fd55544a0ad9034be61ccac4ed34dd3704c9e61fbd180435e22a8b193e1efc5d2400260aab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082715d8203e880a094060d33845bfae28224b9f4bebca1ce74cea6979fb7ef9fe21a425ba7422d54885cfd860e25b812dff861f85f800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca0eab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cda043d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0cc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1d",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xeab5fca09ac6909e72a92ec0fced7ce18900f2024141b40e0c61adec0be059cd",
-                        "s" : "0x43d95a7d30256afeb5792db54b1b22199f974794e6bc7efdfcdaf34109f5bb0c",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x17"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xef1bb6b29119fd8042d4ed3543a0682ea4f6e2c84456090419aef623013dfe8a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9ccb0c4ed8bebbe743112c67416ed1c59fdad42dfa0ac2a3cf47ae2bb4aeba61",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ccb0c4ed8bebbe743112c67416ed1c59fdad42dfa0ac2a3cf47ae2bb4aeba61a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5684a79be37e49b62aec5b837e4a81d96912e5d4779576bb4b1674a37ff83591",
-        "network" : "Homestead",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640017",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4715d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7638e8c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a60005360016000670de0b6b3a7640018f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0.json
index a516f41f7..0c3b3bd3f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0.json
@@ -2,10 +2,10 @@
     "createInitFailBadJumpDestination_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json",
-            "sourceHash" : "f61e36083971b12d0392b0a3d1491766d28f41f48e9cf98f6ed4b6f77a35b567"
+            "sourceHash" : "314caaf1a59832c4fb5d4b56c7f78fef1c7f76d03b8903841afab31e53292bcb"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05de2429",
-                    "hash" : "0xab87f25bb6d62bd0ad0b7d73e98187e0a46b16a3c586b56660476fa391780d96",
-                    "mixHash" : "0x60d28737425e40fd2a248fa6e725c218a7c1234e1fb2678f88397f62af34b2be",
-                    "nonce" : "0xe0800ee35fb9b8c9",
+                    "hash" : "0x5a02dad83f7080bc44ef023b40e04345e5c462470f7d104612869b2d546d377c",
+                    "mixHash" : "0x317651fc0eca96db9285184c7bd6eec7ab5a28a0965f1c2355061a59981fbfb9",
+                    "nonce" : "0x4d14048a730905ed",
                     "number" : "0x01",
                     "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
                     "receiptTrie" : "0x4abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e506925dbe96d14428c93dabd3b9bf0d1aa7d397c06b32b3434bee57c0ee175a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a060d28737425e40fd2a248fa6e725c218a7c1234e1fb2678f88397f62af34b2be88e0800ee35fb9b8c9f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e506925dbe96d14428c93dabd3b9bf0d1aa7d397c06b32b3434bee57c0ee175a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0317651fc0eca96db9285184c7bd6eec7ab5a28a0965f1c2355061a59981fbfb9884d14048a730905edf866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab87f25bb6d62bd0ad0b7d73e98187e0a46b16a3c586b56660476fa391780d96",
+        "lastblockhash" : "0x5a02dad83f7080bc44ef023b40e04345e5c462470f7d104612869b2d546d377c",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createInitFailBadJumpDestination_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/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json",
-            "sourceHash" : "f61e36083971b12d0392b0a3d1491766d28f41f48e9cf98f6ed4b6f77a35b567"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0x7316f39e002a242b75012006cc5c30c708dac5c2cef84f3838543f661e419230",
-                    "mixHash" : "0x4eca649174e38e6165c9d62a858e5b25d11159c9ee8a56419e30b4a7eef6540f",
-                    "nonce" : "0x09a630da4614aac7",
-                    "number" : "0x01",
-                    "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a04eca649174e38e6165c9d62a858e5b25d11159c9ee8a56419e30b4a7eef6540f8809a630da4614aac7f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xafd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7316f39e002a242b75012006cc5c30c708dac5c2cef84f3838543f661e419230",
-        "network" : "EIP150",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6056600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createInitFailBadJumpDestination_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/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json",
-            "sourceHash" : "f61e36083971b12d0392b0a3d1491766d28f41f48e9cf98f6ed4b6f77a35b567"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0xe6484dccf093ce6186d56a53b2c5c938f9c78a8cefb6811a2d1fffcbd810b898",
-                    "mixHash" : "0xd6c0552b04efb52b800e6d0e56cd99de3c94dc64a8ada56e2ee7c381436ee8c1",
-                    "nonce" : "0x196719c0ad5c3524",
-                    "number" : "0x01",
-                    "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0d6c0552b04efb52b800e6d0e56cd99de3c94dc64a8ada56e2ee7c381436ee8c188196719c0ad5c3524f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xafd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6484dccf093ce6186d56a53b2c5c938f9c78a8cefb6811a2d1fffcbd810b898",
-        "network" : "EIP158",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6056600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createInitFailBadJumpDestination_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json",
-            "sourceHash" : "f61e36083971b12d0392b0a3d1491766d28f41f48e9cf98f6ed4b6f77a35b567"
+            "sourceHash" : "314caaf1a59832c4fb5d4b56c7f78fef1c7f76d03b8903841afab31e53292bcb"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05f58340",
-                    "hash" : "0xd7b7a8c0a23a86eca925a5fc5449c937abd852cf1666e81bc11761476caf4698",
-                    "mixHash" : "0x0dab3f6783c1014a7ddcf33600362c438fec95157e676bd35a5511388142ccd1",
-                    "nonce" : "0x3d9cc7081230926c",
+                    "hash" : "0xe38bebb4959642ebfd7eb62989b4340f020f88987fa7446ad8ca16368d9ab1b0",
+                    "mixHash" : "0x57a266a1ab7d82a1e0b91a27f40fbbdd7c1c4671ad71c2d311e1c9f0890a3a31",
+                    "nonce" : "0x400bc217291a42b8",
                     "number" : "0x01",
                     "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
                     "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a00dab3f6783c1014a7ddcf33600362c438fec95157e676bd35a5511388142ccd1883d9cc7081230926cf866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a057a266a1ab7d82a1e0b91a27f40fbbdd7c1c4671ad71c2d311e1c9f0890a3a3188400bc217291a42b8f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7b7a8c0a23a86eca925a5fc5449c937abd852cf1666e81bc11761476caf4698",
+        "lastblockhash" : "0xe38bebb4959642ebfd7eb62989b4340f020f88987fa7446ad8ca16368d9ab1b0",
         "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createInitFailBadJumpDestination_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json",
-            "sourceHash" : "f61e36083971b12d0392b0a3d1491766d28f41f48e9cf98f6ed4b6f77a35b567"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05f58340",
-                    "hash" : "0xa769d28679f844f68ee2bc533c438f1c68fe2cc8cb43a7a10dd7806c263d83e7",
-                    "mixHash" : "0xd898d507525cdd6bb398eda09ef2d0af03042164d6a5c337217e0172212903cf",
-                    "nonce" : "0x24aab70170233f16",
-                    "number" : "0x01",
-                    "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-                    "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
-                    "stateRoot" : "0xf8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a0d898d507525cdd6bb398eda09ef2d0af03042164d6a5c337217e0172212903cf8824aab70170233f16f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xafd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa769d28679f844f68ee2bc533c438f1c68fe2cc8cb43a7a10dd7806c263d83e7",
-        "network" : "Homestead",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae98340",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a16cf620",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6056600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0.json
index a919066e3..6d94816f3 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0.json
@@ -2,10 +2,10 @@
     "createInitFailStackSizeLargerThan1024_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json",
-            "sourceHash" : "03a0dea294187f2421131ecee4206921f4aa4ba4f67339ba7393d09c89d8c8a9"
+            "sourceHash" : "fe9039500e52a388e102266d0f00879d30c852f30c93969f83e581c07879afee"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05de2429",
-                    "hash" : "0x311339c2053c249a1fd61791d20f52a850ff7b604c66851c8d24b47b11176b0a",
-                    "mixHash" : "0x497698d2112fca528c91df1c111fff5d37625ad928f10cd3d0c6070daab69ff5",
-                    "nonce" : "0x38f862fc36206c4b",
+                    "hash" : "0x01df71cb8eb14fd7faea2d1ea0a19c518e57e58d55f79e6347b71ce93c049212",
+                    "mixHash" : "0xad4185f98305bc14054c6b669ddd0484d6b36aafd5eb1aedcd44d73f2e6082b2",
+                    "nonce" : "0x189336b116a04bd5",
                     "number" : "0x01",
                     "parentHash" : "0xf1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdc",
                     "receiptTrie" : "0x4abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0f1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e506925dbe96d14428c93dabd3b9bf0d1aa7d397c06b32b3434bee57c0ee175a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0497698d2112fca528c91df1c111fff5d37625ad928f10cd3d0c6070daab69ff58838f862fc36206c4bf866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0f1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e506925dbe96d14428c93dabd3b9bf0d1aa7d397c06b32b3434bee57c0ee175a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0ad4185f98305bc14054c6b669ddd0484d6b36aafd5eb1aedcd44d73f2e6082b288189336b116a04bd5f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d909a89d1c7230978389323fa2e35f627e6b747a4df4ab59e28c3ef3556913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x311339c2053c249a1fd61791d20f52a850ff7b604c66851c8d24b47b11176b0a",
+        "lastblockhash" : "0x01df71cb8eb14fd7faea2d1ea0a19c518e57e58d55f79e6347b71ce93c049212",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createInitFailStackSizeLargerThan1024_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/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json",
-            "sourceHash" : "03a0dea294187f2421131ecee4206921f4aa4ba4f67339ba7393d09c89d8c8a9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0xb26431463184d73e419d99eb33f4c08c0fbfa297913d689cc7c7068bd7207b4d",
-                    "mixHash" : "0x6b8aa281901ee92493716ece2d83f1cbeaa42529b69777125aacac90c8a8f038",
-                    "nonce" : "0x40a0753267f1f270",
-                    "number" : "0x01",
-                    "parentHash" : "0xf1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdc",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0f1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a06b8aa281901ee92493716ece2d83f1cbeaa42529b69777125aacac90c8a8f0388840a0753267f1f270f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xf1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdc",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc0d909a89d1c7230978389323fa2e35f627e6b747a4df4ab59e28c3ef3556913",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d909a89d1c7230978389323fa2e35f627e6b747a4df4ab59e28c3ef3556913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb26431463184d73e419d99eb33f4c08c0fbfa297913d689cc7c7068bd7207b4d",
-        "network" : "EIP150",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f6103ff6000525b7f0102030405060708090a0102030405060708090a010203046000527f05060708090a0102600160005103600052600051600657000000000000000000602052604060006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createInitFailStackSizeLargerThan1024_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/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json",
-            "sourceHash" : "03a0dea294187f2421131ecee4206921f4aa4ba4f67339ba7393d09c89d8c8a9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0xfc888ea6d86604e7e91b2a5a7741f2ca8f90da437f8e159391ea4da2bd5251e0",
-                    "mixHash" : "0x98c8e5065f3ba470c868b79f4bb8f30e52e8a06b379b6cecc84fcbece945d0ab",
-                    "nonce" : "0xd60e59f155ca98c2",
-                    "number" : "0x01",
-                    "parentHash" : "0xf1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdc",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0f1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a098c8e5065f3ba470c868b79f4bb8f30e52e8a06b379b6cecc84fcbece945d0ab88d60e59f155ca98c2f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xf1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdc",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc0d909a89d1c7230978389323fa2e35f627e6b747a4df4ab59e28c3ef3556913",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d909a89d1c7230978389323fa2e35f627e6b747a4df4ab59e28c3ef3556913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc888ea6d86604e7e91b2a5a7741f2ca8f90da437f8e159391ea4da2bd5251e0",
-        "network" : "EIP158",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f6103ff6000525b7f0102030405060708090a0102030405060708090a010203046000527f05060708090a0102600160005103600052600051600657000000000000000000602052604060006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createInitFailStackSizeLargerThan1024_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json",
-            "sourceHash" : "03a0dea294187f2421131ecee4206921f4aa4ba4f67339ba7393d09c89d8c8a9"
+            "sourceHash" : "fe9039500e52a388e102266d0f00879d30c852f30c93969f83e581c07879afee"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05f58340",
-                    "hash" : "0x05f60f56a746596f2dbce23bb9845cb0128e299487f4364708d0250649d8fbcd",
-                    "mixHash" : "0x7c24cf8568e1254ec8971b605c07f1cc4f091bfb013273ad9492b430a5f436d1",
-                    "nonce" : "0x9791726b0e49ecca",
+                    "hash" : "0xc302dd0b494e5777fa8698ebdb13bc107dd0c115209b7ccd3da9dbdf022a7ca3",
+                    "mixHash" : "0x064142171c5294917b0bbd79bc7ea480d555488c2a1e65665dc921d3fd8ea652",
+                    "nonce" : "0x3597830fbff17894",
                     "number" : "0x01",
                     "parentHash" : "0xf1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdc",
                     "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0f1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a07c24cf8568e1254ec8971b605c07f1cc4f091bfb013273ad9492b430a5f436d1889791726b0e49eccaf866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0f1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a0064142171c5294917b0bbd79bc7ea480d555488c2a1e65665dc921d3fd8ea652883597830fbff17894f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d909a89d1c7230978389323fa2e35f627e6b747a4df4ab59e28c3ef3556913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05f60f56a746596f2dbce23bb9845cb0128e299487f4364708d0250649d8fbcd",
+        "lastblockhash" : "0xc302dd0b494e5777fa8698ebdb13bc107dd0c115209b7ccd3da9dbdf022a7ca3",
         "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createInitFailStackSizeLargerThan1024_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json",
-            "sourceHash" : "03a0dea294187f2421131ecee4206921f4aa4ba4f67339ba7393d09c89d8c8a9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05f58340",
-                    "hash" : "0x7014feb64f0badf3b75d11448e8df4a3bc29431d941ec184e8f85c8b7fd1a8ae",
-                    "mixHash" : "0x9efed6408de2be0d32572c1263f28327fe35e23d8261b8aca81787e5124a404c",
-                    "nonce" : "0x95e6b4499dc4b567",
-                    "number" : "0x01",
-                    "parentHash" : "0xf1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdc",
-                    "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
-                    "stateRoot" : "0xf8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0f1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a09efed6408de2be0d32572c1263f28327fe35e23d8261b8aca81787e5124a404c8895e6b4499dc4b567f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xf1a11a66269e7e13b21baf76532b3b0255c41c6a974fe6e72d2af0c0bc478bdc",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc0d909a89d1c7230978389323fa2e35f627e6b747a4df4ab59e28c3ef3556913",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d909a89d1c7230978389323fa2e35f627e6b747a4df4ab59e28c3ef3556913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7014feb64f0badf3b75d11448e8df4a3bc29431d941ec184e8f85c8b7fd1a8ae",
-        "network" : "Homestead",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae98340",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a16cf620",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f6103ff6000525b7f0102030405060708090a0102030405060708090a010203046000527f05060708090a0102600160005103600052600051600657000000000000000000602052604060006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0.json
index 4fa5e04cd..883616bba 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0.json
@@ -2,10 +2,10 @@
     "createInitFailStackUnderflow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json",
-            "sourceHash" : "61a7de423154b3baefb67f4aa44f4676aa8c3b675e63c0febc6b58d11cd03ee4"
+            "sourceHash" : "131e6b05e45ece658a508ba2b610d5f0343fff940e5d67bcdc2aeea746dac13d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05de2429",
-                    "hash" : "0xf1fb0192e22b9ef556fa4bf8c414f032970439681e3c2aa10a37915368f7ca1b",
-                    "mixHash" : "0x459ac83fd128b19f6b06321a9c84ca30a69057b08620bd216f7c520ec709214e",
-                    "nonce" : "0x16f55d336b96adbb",
+                    "hash" : "0x857c4c27481510e05bd6f1cff87cd93d3f9f05ad2f41dc1a52f9b50f910517e8",
+                    "mixHash" : "0xa960eb86551800e20bea544152dd6fb89397a915313f70c854594e3fc0796ac5",
+                    "nonce" : "0xda33189a18ad3c45",
                     "number" : "0x01",
                     "parentHash" : "0xd43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8",
                     "receiptTrie" : "0x4abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0d43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e506925dbe96d14428c93dabd3b9bf0d1aa7d397c06b32b3434bee57c0ee175a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0459ac83fd128b19f6b06321a9c84ca30a69057b08620bd216f7c520ec709214e8816f55d336b96adbbf866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0d43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e506925dbe96d14428c93dabd3b9bf0d1aa7d397c06b32b3434bee57c0ee175a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0a960eb86551800e20bea544152dd6fb89397a915313f70c854594e3fc0796ac588da33189a18ad3c45f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022d5b6bc4b2b8227d523b6bf1e97a70614ab33fd53f6408472a7911a3568027ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1fb0192e22b9ef556fa4bf8c414f032970439681e3c2aa10a37915368f7ca1b",
+        "lastblockhash" : "0x857c4c27481510e05bd6f1cff87cd93d3f9f05ad2f41dc1a52f9b50f910517e8",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createInitFailStackUnderflow_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/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json",
-            "sourceHash" : "61a7de423154b3baefb67f4aa44f4676aa8c3b675e63c0febc6b58d11cd03ee4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0xfaf1222cdd9ca8dfc65c48ca91eb3d2220d1e9e2606bb22b301963b4533ab2b9",
-                    "mixHash" : "0x802456ba9a8ecfdafcbeabd365e69dc1f22b4d05ab4f9682dc143206d00da54b",
-                    "nonce" : "0xaceabfc4618a76e4",
-                    "number" : "0x01",
-                    "parentHash" : "0xd43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0d43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0802456ba9a8ecfdafcbeabd365e69dc1f22b4d05ab4f9682dc143206d00da54b88aceabfc4618a76e4f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xd43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x22d5b6bc4b2b8227d523b6bf1e97a70614ab33fd53f6408472a7911a3568027e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022d5b6bc4b2b8227d523b6bf1e97a70614ab33fd53f6408472a7911a3568027ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfaf1222cdd9ca8dfc65c48ca91eb3d2220d1e9e2606bb22b301963b4533ab2b9",
-        "network" : "EIP150",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createInitFailStackUnderflow_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/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json",
-            "sourceHash" : "61a7de423154b3baefb67f4aa44f4676aa8c3b675e63c0febc6b58d11cd03ee4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0x7d5b5723eb15291131a55c38974e731d08814ee14571934f36359753be9f5df6",
-                    "mixHash" : "0x04f236d5c6ac6e8b56fc0ca11279802e8b3547d86264c7a0f772eea14e9771b2",
-                    "nonce" : "0x6573124e0c41137a",
-                    "number" : "0x01",
-                    "parentHash" : "0xd43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0d43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a004f236d5c6ac6e8b56fc0ca11279802e8b3547d86264c7a0f772eea14e9771b2886573124e0c41137af866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xd43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x22d5b6bc4b2b8227d523b6bf1e97a70614ab33fd53f6408472a7911a3568027e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022d5b6bc4b2b8227d523b6bf1e97a70614ab33fd53f6408472a7911a3568027ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d5b5723eb15291131a55c38974e731d08814ee14571934f36359753be9f5df6",
-        "network" : "EIP158",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createInitFailStackUnderflow_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json",
-            "sourceHash" : "61a7de423154b3baefb67f4aa44f4676aa8c3b675e63c0febc6b58d11cd03ee4"
+            "sourceHash" : "131e6b05e45ece658a508ba2b610d5f0343fff940e5d67bcdc2aeea746dac13d"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05f58340",
-                    "hash" : "0xdf7a9e0ee4abd6c61054c99dbeeb149d0c4cb8b8a60fcc52f1750f17025dee8e",
-                    "mixHash" : "0x99a7af71f5ef2d0a19e52872f3f76fe91c07e8485e876b8b294a44a7565355b5",
-                    "nonce" : "0xfa0351a1fa87bbdc",
+                    "hash" : "0xab41001290f8da80774b355604b395b185c901c22fa0998fee33e90893a946d2",
+                    "mixHash" : "0x2f6087dfb5c912894b8102e8f0bbeac1ba612830adb3b68eb420a073509913a7",
+                    "nonce" : "0xfb02495e0ea35377",
                     "number" : "0x01",
                     "parentHash" : "0xd43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8",
                     "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0d43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a099a7af71f5ef2d0a19e52872f3f76fe91c07e8485e876b8b294a44a7565355b588fa0351a1fa87bbdcf866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0d43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a02f6087dfb5c912894b8102e8f0bbeac1ba612830adb3b68eb420a073509913a788fb02495e0ea35377f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022d5b6bc4b2b8227d523b6bf1e97a70614ab33fd53f6408472a7911a3568027ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf7a9e0ee4abd6c61054c99dbeeb149d0c4cb8b8a60fcc52f1750f17025dee8e",
+        "lastblockhash" : "0xab41001290f8da80774b355604b395b185c901c22fa0998fee33e90893a946d2",
         "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createInitFailStackUnderflow_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json",
-            "sourceHash" : "61a7de423154b3baefb67f4aa44f4676aa8c3b675e63c0febc6b58d11cd03ee4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05f58340",
-                    "hash" : "0xd8f250340aa86e48ba41d3c6b977754d6384f79bc81654eb50c7ba0ea0a12f8e",
-                    "mixHash" : "0xe94dc450a1436423b3adbc637aec30691092a351e6aafdbdf8c405dc86cb292e",
-                    "nonce" : "0x239e358163b0ce00",
-                    "number" : "0x01",
-                    "parentHash" : "0xd43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8",
-                    "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
-                    "stateRoot" : "0xf8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0d43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a0e94dc450a1436423b3adbc637aec30691092a351e6aafdbdf8c405dc86cb292e88239e358163b0ce00f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xd43a3fd22ea197ec691954d8c2b1cf0d69f99b7a68a2e690f551496e5a5107c8",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x22d5b6bc4b2b8227d523b6bf1e97a70614ab33fd53f6408472a7911a3568027e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022d5b6bc4b2b8227d523b6bf1e97a70614ab33fd53f6408472a7911a3568027ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8f250340aa86e48ba41d3c6b977754d6384f79bc81654eb50c7ba0ea0a12f8e",
-        "network" : "Homestead",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae98340",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a16cf620",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0.json
index 7805be5cd..c082a7fed 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0.json
@@ -2,10 +2,10 @@
     "createInitFailUndefinedInstruction_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json",
-            "sourceHash" : "a15e16ae129fe11396c2c8c18244fef66146c90fad138ea82d607f775d64598a"
+            "sourceHash" : "daac4d34eb2aee14cd856daf7663e21800d63d253b3d4fda56aadea9e526fa71"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05de2429",
-                    "hash" : "0x6f2812d5db71a6cdc0845072b58f06b6c4869cdee6ea8a36f39cf5eec2279459",
-                    "mixHash" : "0xac41823bc9931bcd3a00b48e90f132129c197c6026e66c8f32187464529da7d4",
-                    "nonce" : "0x2e6ffb87fab1ca2f",
+                    "hash" : "0x064bf99dd64f22e2e624271f95d865aaad88fe39e51ac2fb52d53c759afe016b",
+                    "mixHash" : "0xfc32ebae21c5c6b7a74d14f06d191362082cc5e10707c4442b4efcaa93c3d956",
+                    "nonce" : "0x837afaab00799753",
                     "number" : "0x01",
                     "parentHash" : "0xcbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6",
                     "receiptTrie" : "0x4abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0cbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e506925dbe96d14428c93dabd3b9bf0d1aa7d397c06b32b3434bee57c0ee175a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0ac41823bc9931bcd3a00b48e90f132129c197c6026e66c8f32187464529da7d4882e6ffb87fab1ca2ff866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0cbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e506925dbe96d14428c93dabd3b9bf0d1aa7d397c06b32b3434bee57c0ee175a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0fc32ebae21c5c6b7a74d14f06d191362082cc5e10707c4442b4efcaa93c3d95688837afaab00799753f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00028a671f4b1a1255d40c41e1285c80b0707c3d574be68568f5e7d31a3dc7d60a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f2812d5db71a6cdc0845072b58f06b6c4869cdee6ea8a36f39cf5eec2279459",
+        "lastblockhash" : "0x064bf99dd64f22e2e624271f95d865aaad88fe39e51ac2fb52d53c759afe016b",
         "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createInitFailUndefinedInstruction_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/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json",
-            "sourceHash" : "a15e16ae129fe11396c2c8c18244fef66146c90fad138ea82d607f775d64598a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0x74f8836d3f162826ca473f0d4ddecb3980af70a61965daf00cc87ae4cb0e66ac",
-                    "mixHash" : "0xfa06365e6a34ccc4c8890aff76200e1944276a5eb349389f6f3bcc12fc72a72f",
-                    "nonce" : "0x5617dcafd8a7a08c",
-                    "number" : "0x01",
-                    "parentHash" : "0xcbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0cbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0fa06365e6a34ccc4c8890aff76200e1944276a5eb349389f6f3bcc12fc72a72f885617dcafd8a7a08cf866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xcbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0028a671f4b1a1255d40c41e1285c80b0707c3d574be68568f5e7d31a3dc7d60",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00028a671f4b1a1255d40c41e1285c80b0707c3d574be68568f5e7d31a3dc7d60a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74f8836d3f162826ca473f0d4ddecb3980af70a61965daf00cc87ae4cb0e66ac",
-        "network" : "EIP150",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60f4600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createInitFailUndefinedInstruction_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/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json",
-            "sourceHash" : "a15e16ae129fe11396c2c8c18244fef66146c90fad138ea82d607f775d64598a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0xb7a4ddced6ff6522c4b91b86a85f18aff7f0e84586161ca3de0aaf118023eac3",
-                    "mixHash" : "0xc0f7fb49e6632da4f3a1abe72911c27ace07eb1ad79f1560052663d623ea1041",
-                    "nonce" : "0xf58c80de4691232d",
-                    "number" : "0x01",
-                    "parentHash" : "0xcbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0cbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0c0f7fb49e6632da4f3a1abe72911c27ace07eb1ad79f1560052663d623ea104188f58c80de4691232df866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xcbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0028a671f4b1a1255d40c41e1285c80b0707c3d574be68568f5e7d31a3dc7d60",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00028a671f4b1a1255d40c41e1285c80b0707c3d574be68568f5e7d31a3dc7d60a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7a4ddced6ff6522c4b91b86a85f18aff7f0e84586161ca3de0aaf118023eac3",
-        "network" : "EIP158",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60f4600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createInitFailUndefinedInstruction_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json",
-            "sourceHash" : "a15e16ae129fe11396c2c8c18244fef66146c90fad138ea82d607f775d64598a"
+            "sourceHash" : "daac4d34eb2aee14cd856daf7663e21800d63d253b3d4fda56aadea9e526fa71"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05f58340",
-                    "hash" : "0x314ed70502e3ec80b14011f3926941bdf4603b9e5baa13178758c38fe7693d12",
-                    "mixHash" : "0x026409d9472650b41d27a457955889ff6b401084a3ea8150dd04fbf38ca76cda",
-                    "nonce" : "0x7061a57ee9901eb3",
+                    "hash" : "0x2c1d912adb7a883d648e23dbd6a1b5f0e6d2e3ced16be977e5cd0b676fce5ef6",
+                    "mixHash" : "0x7ecb4f9fb76d6ad31d7f572754a2b0c4f0fb1c2b760d5d4d3969220f1224bba7",
+                    "nonce" : "0xbae990d3d7a9a4ba",
                     "number" : "0x01",
                     "parentHash" : "0xcbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6",
                     "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0cbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a0026409d9472650b41d27a457955889ff6b401084a3ea8150dd04fbf38ca76cda887061a57ee9901eb3f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0cbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a07ecb4f9fb76d6ad31d7f572754a2b0c4f0fb1c2b760d5d4d3969220f1224bba788bae990d3d7a9a4baf866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00028a671f4b1a1255d40c41e1285c80b0707c3d574be68568f5e7d31a3dc7d60a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x314ed70502e3ec80b14011f3926941bdf4603b9e5baa13178758c38fe7693d12",
+        "lastblockhash" : "0x2c1d912adb7a883d648e23dbd6a1b5f0e6d2e3ced16be977e5cd0b676fce5ef6",
         "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createInitFailUndefinedInstruction_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json",
-            "sourceHash" : "a15e16ae129fe11396c2c8c18244fef66146c90fad138ea82d607f775d64598a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05f58340",
-                    "hash" : "0xc16bb53a62e97dc1d015cb69e34c4905fb775896aa6be4d1a20f5b725db69d00",
-                    "mixHash" : "0x6dc689e2142789972ce8580ede5a83708535f54f22e6f86670cda556f84a16c8",
-                    "nonce" : "0x5266586012768849",
-                    "number" : "0x01",
-                    "parentHash" : "0xcbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6",
-                    "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
-                    "stateRoot" : "0xf8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90266f901faa0cbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a06dc689e2142789972ce8580ede5a83708535f54f22e6f86670cda556f84a16c8885266586012768849f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x05f5e100",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
-                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0xcbff487273a0530d8baf340d76584e5102451c615f470f41b37fc634509ff7d6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0028a671f4b1a1255d40c41e1285c80b0707c3d574be68568f5e7d31a3dc7d60",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00028a671f4b1a1255d40c41e1285c80b0707c3d574be68568f5e7d31a3dc7d60a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc16bb53a62e97dc1d015cb69e34c4905fb775896aa6be4d1a20f5b725db69d00",
-        "network" : "Homestead",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae98340",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a16cf620",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60f4600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0.json
index bc2311f9a..684dbaf04 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0.json
@@ -2,10 +2,10 @@
     "createInitFail_OOGduringInit_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "7b13bbbbd3ba94f7010246c98f06f24eeeab2890946066e1fa464795d50b302a"
+            "sourceHash" : "c0cb0aeabea8dd079c6a78589272a378c389a9513a0b96d39e17aaeab5d61d2d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf1d",
-                    "hash" : "0x94bee91014f425ba51109bf0fbf46d5e10696aa88d161ada9ba63c0ee478501d",
-                    "mixHash" : "0x85df4014958c062cd5807f88efc89132378b72cb5ff1bd56dfa3a775728d898d",
-                    "nonce" : "0xd9d7c43fcd9730e8",
+                    "hash" : "0xde748dd9c89b58f1b2f286d4e664dafda8d3a721cfe70de3a1dac5944128390e",
+                    "mixHash" : "0xe2a6a9be960ae640a651b3933e50822aaa5255af57dfdce3987bdc36f42ffbfa",
+                    "nonce" : "0xe7c0e6977abfa597",
                     "number" : "0x01",
                     "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
                     "receiptTrie" : "0x00b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e2350a2158d4d013402ff76c151589280abd0727fb63d479dde3d9980bf8ce5a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a000b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1d8203e880a085df4014958c062cd5807f88efc89132378b72cb5ff1bd56dfa3a775728d898d88d9d7c43fcd9730e8f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e2350a2158d4d013402ff76c151589280abd0727fb63d479dde3d9980bf8ce5a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a000b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1d8203e880a0e2a6a9be960ae640a651b3933e50822aaa5255af57dfdce3987bdc36f42ffbfa88e7c0e6977abfa597f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94bee91014f425ba51109bf0fbf46d5e10696aa88d161ada9ba63c0ee478501d",
+        "lastblockhash" : "0xde748dd9c89b58f1b2f286d4e664dafda8d3a721cfe70de3a1dac5944128390e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createInitFail_OOGduringInit_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "7b13bbbbd3ba94f7010246c98f06f24eeeab2890946066e1fa464795d50b302a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xcf1d",
-                    "hash" : "0xccd05ab3a37e5fc60c5752e8583db12499672bb4f4879b940a69ef21862fb0b9",
-                    "mixHash" : "0x004e9b18e1c8d4836879f3a01b15e4242baca4ca6833658afbfaa2615f964177",
-                    "nonce" : "0x8f8825183aca2508",
-                    "number" : "0x01",
-                    "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-                    "receiptTrie" : "0x737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451",
-                    "stateRoot" : "0x4b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1d8203e880a0004e9b18e1c8d4836879f3a01b15e4242baca4ca6833658afbfaa2615f964177888f8825183aca2508f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1d",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x58292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7",
-                        "s" : "0x022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xccd05ab3a37e5fc60c5752e8583db12499672bb4f4879b940a69ef21862fb0b9",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf1d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76330e3",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createInitFail_OOGduringInit_d0g0v0_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/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "7b13bbbbd3ba94f7010246c98f06f24eeeab2890946066e1fa464795d50b302a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xcf1d",
-                    "hash" : "0x93091d335ee1b3c8411286209939862081eeeec647fee34c4359a5c81ad5720e",
-                    "mixHash" : "0x75ec9e004578582ee8d9fcb467efa01ed4b80ea489aa89cb41f968d49a76e2e1",
-                    "nonce" : "0x31d44bffab03d135",
-                    "number" : "0x01",
-                    "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-                    "receiptTrie" : "0x737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451",
-                    "stateRoot" : "0x4b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1d8203e880a075ec9e004578582ee8d9fcb467efa01ed4b80ea489aa89cb41f968d49a76e2e18831d44bffab03d135f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1d",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x58292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7",
-                        "s" : "0x022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93091d335ee1b3c8411286209939862081eeeec647fee34c4359a5c81ad5720e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf1d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76330e3",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createInitFail_OOGduringInit_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "7b13bbbbd3ba94f7010246c98f06f24eeeab2890946066e1fa464795d50b302a"
+            "sourceHash" : "c0cb0aeabea8dd079c6a78589272a378c389a9513a0b96d39e17aaeab5d61d2d"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x715d",
-                    "hash" : "0x785afcf3fabe06b998dc734f53769735e0f916225812d9b8f6d3584d9898727a",
-                    "mixHash" : "0xb4c88bb9e7030a73aa025ff9d74f3b2eb8677bbbe8e0419518988fdcb731b574",
-                    "nonce" : "0x5abdfd61ed2ce578",
+                    "hash" : "0x50b82a085901d74539ac1bf7d2a6e302d227a4bd6b98beaf843b00b0dd6227a7",
+                    "mixHash" : "0xc9d14d515b5d5bac8ed651a4deaddcec0648714eb7898afc61a57d2063fe120e",
+                    "nonce" : "0x6399b59df1bf272f",
                     "number" : "0x01",
                     "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
                     "receiptTrie" : "0xd0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6c",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082715d8203e880a0b4c88bb9e7030a73aa025ff9d74f3b2eb8677bbbe8e0419518988fdcb731b574885abdfd61ed2ce578f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082715d8203e880a0c9d14d515b5d5bac8ed651a4deaddcec0648714eb7898afc61a57d2063fe120e886399b59df1bf272ff864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x785afcf3fabe06b998dc734f53769735e0f916225812d9b8f6d3584d9898727a",
+        "lastblockhash" : "0x50b82a085901d74539ac1bf7d2a6e302d227a4bd6b98beaf843b00b0dd6227a7",
         "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createInitFail_OOGduringInit_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "7b13bbbbd3ba94f7010246c98f06f24eeeab2890946066e1fa464795d50b302a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x715d",
-                    "hash" : "0xf49cd80da721fb68840810bef34b1b17822b1a5d8134b933b5e16c84099369c7",
-                    "mixHash" : "0x3edd394aacf4df52a51eb9807ef5064beacbd82ef68343856187296e55c62c69",
-                    "nonce" : "0x868aabdcaf0fa176",
-                    "number" : "0x01",
-                    "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-                    "receiptTrie" : "0xd0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6c",
-                    "stateRoot" : "0x6eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082715d8203e880a03edd394aacf4df52a51eb9807ef5064beacbd82ef68343856187296e55c62c6988868aabdcaf0fa176f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1d",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x58292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7",
-                        "s" : "0x022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf49cd80da721fb68840810bef34b1b17822b1a5d8134b933b5e16c84099369c7",
-        "network" : "Homestead",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4715d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7620803",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0.json
index 220087a8a..f2a4eba77 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0.json
@@ -2,10 +2,10 @@
     "createInitOOGforCREATE_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json",
-            "sourceHash" : "23651cd2def096ac42980beb7a3e6963b89489cabcae6812d78442fa608da6a5"
+            "sourceHash" : "48e9e6d86dd8ca3dc3d83f349adb03b9a0dafbbf9ef1fb5ca497457843f6a60e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf1c",
-                    "hash" : "0xbd3cbcab2b048471607c4108b6ff2013ccca80442d4132cb6823425104edd78e",
-                    "mixHash" : "0x477ca8be031f9d5adf13a9101ea090c4ab7ca89ad908429cc3c76bcd0ac49e97",
-                    "nonce" : "0xc346e239f665a96d",
+                    "hash" : "0xba64d1c986af68d72b15d208acb2e06568abef4a76c8c0884608ba43053ba726",
+                    "mixHash" : "0xf43c5473293fd7d90da4ffa3e91fdb2c4fac2af7f839feb6e7430bd561dfc08d",
+                    "nonce" : "0x8853f6bcb0c4f966",
                     "number" : "0x01",
                     "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
                     "receiptTrie" : "0x7a5c1bb60cd075699d19096d3ad5ccad3d0d0027adc70ddb469fb787291f9a42",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x04eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd6f51ceb3f84fa4aad66f605c0863f6f32597519fbda7bd6ea7eeff0aba6caa004eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100a07a5c1bb60cd075699d19096d3ad5ccad3d0d0027adc70ddb469fb787291f9a42b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1c8203e880a0477ca8be031f9d5adf13a9101ea090c4ab7ca89ad908429cc3c76bcd0ac49e9788c346e239f665a96df864f862800182cf1c94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca096120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2a0069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49c0",
+                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd6f51ceb3f84fa4aad66f605c0863f6f32597519fbda7bd6ea7eeff0aba6caa004eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100a07a5c1bb60cd075699d19096d3ad5ccad3d0d0027adc70ddb469fb787291f9a42b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1c8203e880a0f43c5473293fd7d90da4ffa3e91fdb2c4fac2af7f839feb6e7430bd561dfc08d888853f6bcb0c4f966f864f862800182cf1c94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca096120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2a0069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1c",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd3cbcab2b048471607c4108b6ff2013ccca80442d4132cb6823425104edd78e",
+        "lastblockhash" : "0xba64d1c986af68d72b15d208acb2e06568abef4a76c8c0884608ba43053ba726",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createInitOOGforCREATE_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/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json",
-            "sourceHash" : "23651cd2def096ac42980beb7a3e6963b89489cabcae6812d78442fa608da6a5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xcf1c",
-                    "hash" : "0x507d26025b04d0430da7c5dc94ac7604e340d288be924ab90780979b750f8b2e",
-                    "mixHash" : "0x0c916f8d93d193e272656fb66c2d9febf283f7bc09bd789fc93db7a25508f329",
-                    "nonce" : "0x568cf56ac9c0659d",
-                    "number" : "0x01",
-                    "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-                    "receiptTrie" : "0xdd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4",
-                    "stateRoot" : "0x7171d76599484edebff4399d642fe2bcc21ce5f0eaebd330e36afaa62655db15",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x04eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07171d76599484edebff4399d642fe2bcc21ce5f0eaebd330e36afaa62655db15a004eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100a0dd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1c8203e880a00c916f8d93d193e272656fb66c2d9febf283f7bc09bd789fc93db7a25508f32988568cf56ac9c0659df864f862800182cf1c94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca096120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2a0069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1c",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x96120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2",
-                        "s" : "0x069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x507d26025b04d0430da7c5dc94ac7604e340d288be924ab90780979b750f8b2e",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf1c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76330e4",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createInitOOGforCREATE_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/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json",
-            "sourceHash" : "23651cd2def096ac42980beb7a3e6963b89489cabcae6812d78442fa608da6a5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xcf1c",
-                    "hash" : "0x848d4f6ee45fe566e0f85717398df6e05b4b52b468253829b89595bbedcd2ab8",
-                    "mixHash" : "0xc49ae2579819f978c675879633b2bf4be4b03a6c8af93cdee443376769d9cd02",
-                    "nonce" : "0x5f4fe797bdf0cba3",
-                    "number" : "0x01",
-                    "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-                    "receiptTrie" : "0xdd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4",
-                    "stateRoot" : "0x7171d76599484edebff4399d642fe2bcc21ce5f0eaebd330e36afaa62655db15",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x04eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07171d76599484edebff4399d642fe2bcc21ce5f0eaebd330e36afaa62655db15a004eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100a0dd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1c8203e880a0c49ae2579819f978c675879633b2bf4be4b03a6c8af93cdee443376769d9cd02885f4fe797bdf0cba3f864f862800182cf1c94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca096120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2a0069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1c",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x96120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2",
-                        "s" : "0x069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x848d4f6ee45fe566e0f85717398df6e05b4b52b468253829b89595bbedcd2ab8",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf1c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76330e4",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createInitOOGforCREATE_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json",
-            "sourceHash" : "23651cd2def096ac42980beb7a3e6963b89489cabcae6812d78442fa608da6a5"
+            "sourceHash" : "48e9e6d86dd8ca3dc3d83f349adb03b9a0dafbbf9ef1fb5ca497457843f6a60e"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xcf1c",
-                    "hash" : "0xa2db2a8c43a0d5c6e7470fe832a0420684e04668577154f0e2aa47e18c8f7326",
-                    "mixHash" : "0x7d322edc4fbc8387d5304a69f53734f35b3f4202460988f9120d05278e2dc65d",
-                    "nonce" : "0x55b2796b9ecb611d",
+                    "hash" : "0x51833403e69eeede82f18a73e770626bdfe4c1c5a374a061a9725aea04b3b5f3",
+                    "mixHash" : "0xf6711ab8266fae174505499a54f68b7ed68c0e0587d45b62f0656b60d43722bd",
+                    "nonce" : "0xfe0bff2331fdf9de",
                     "number" : "0x01",
                     "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
                     "receiptTrie" : "0xdd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0x04eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07171d76599484edebff4399d642fe2bcc21ce5f0eaebd330e36afaa62655db15a004eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100a0dd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1c8203e880a07d322edc4fbc8387d5304a69f53734f35b3f4202460988f9120d05278e2dc65d8855b2796b9ecb611df864f862800182cf1c94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca096120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2a0069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49c0",
+                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07171d76599484edebff4399d642fe2bcc21ce5f0eaebd330e36afaa62655db15a004eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100a0dd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1c8203e880a0f6711ab8266fae174505499a54f68b7ed68c0e0587d45b62f0656b60d43722bd88fe0bff2331fdf9def864f862800182cf1c94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca096120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2a0069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1c",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2db2a8c43a0d5c6e7470fe832a0420684e04668577154f0e2aa47e18c8f7326",
+        "lastblockhash" : "0x51833403e69eeede82f18a73e770626bdfe4c1c5a374a061a9725aea04b3b5f3",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createInitOOGforCREATE_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json",
-            "sourceHash" : "23651cd2def096ac42980beb7a3e6963b89489cabcae6812d78442fa608da6a5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xcf1c",
-                    "hash" : "0xc5d6e3b2ac92dbfdf87fff54cbed746b598c92efcb87d77a3e5f7e83ffe7de9c",
-                    "mixHash" : "0x6c3e153432d9177675f3b9d3075a4002a9e98c4d1c63efcdfbde386b82a2d15a",
-                    "nonce" : "0x9042f0bc66f7efdd",
-                    "number" : "0x01",
-                    "parentHash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-                    "receiptTrie" : "0xdd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4",
-                    "stateRoot" : "0x7171d76599484edebff4399d642fe2bcc21ce5f0eaebd330e36afaa62655db15",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x04eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f8a065ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07171d76599484edebff4399d642fe2bcc21ce5f0eaebd330e36afaa62655db15a004eedb97be89d949cf1faf5189202e99b64553477cc9fab88dbcf896edf0b100a0dd1a4c11bc3250c7f9e05d36d50fb0f6ee6033d92eb17a2a80ba9d09d29052e4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082cf1c8203e880a06c3e153432d9177675f3b9d3075a4002a9e98c4d1c63efcdfbde386b82a2d15a889042f0bc66f7efddf864f862800182cf1c94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca096120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2a0069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xcf1c",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x96120ddd572a397a8eecc27d621938485b5ef00972d0d68e5796021c0ef3b3d2",
-                        "s" : "0x069357be07113f36ace1da795286710426a8f4a36797ebd7ada1ded2c3873b49",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x65ba0d89bc11a28186a4936b2babe8bc795caa700301fd4296408405169b4c2a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5d6e3b2ac92dbfdf87fff54cbed746b598c92efcb87d77a3e5f7e83ffe7de9c",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf1c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76330e4",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0.json
index 6285041b0..3e3b785ae 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0.json
@@ -2,10 +2,10 @@
     "createJS_ExampleContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json",
-            "sourceHash" : "324be30c5ef3c335f3fd5ac41758c4661c73e3931528a5d6bb33fc58386274cf"
+            "sourceHash" : "c531ba16010a4148aeac458a52fd3d98770c4ef4f571fcd1508e179a44d5159b"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "0x83423e326108d9106f711e5b0aef6e56a4548416a5593f7bb2ab0e3c33776c4e",
-                    "mixHash" : "0x970093c4ad005cc03046ab7a49477dba1c412e4fa8adab142e711a6fdff75d3f",
-                    "nonce" : "0xa7ac6f4c3783aaee",
+                    "hash" : "0x020fc4ea2bf5eace55568c7ebd373b65f26c033248f19d6e75ec861b92c38b91",
+                    "mixHash" : "0xb3144eb16cdbb174235c100327eb9f4034155191db25996b08298d97a6ad3cea",
+                    "nonce" : "0xce8a57b1d5d63e58",
                     "number" : "0x01",
                     "parentHash" : "0x38850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458",
                     "receiptTrie" : "0x498b3877860df644cfd4fcc2e12bc89f717e8618d276fe033ca9152312997215",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9065df901f8a038850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ff055d9225481aea4c93131a6d766780bf768ef287b1d0f1a7d4a077a419612a00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea0498b3877860df644cfd4fcc2e12bc89f717e8618d276fe033ca9152312997215b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830927c08203e880a0970093c4ad005cc03046ab7a49477dba1c412e4fa8adab142e711a6fdff75d3f88a7ac6f4c3783aaeef9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
+                "rlp" : "0xf9065df901f8a038850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ff055d9225481aea4c93131a6d766780bf768ef287b1d0f1a7d4a077a419612a00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea0498b3877860df644cfd4fcc2e12bc89f717e8618d276fe033ca9152312997215b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830927c08203e880a0b3144eb16cdbb174235c100327eb9f4034155191db25996b08298d97a6ad3cea88ce8a57b1d5d63e58f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
                 "transactions" : [
                     {
                         "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1a3750b19ae018e0179d9e5f2ab65af3afe10b15e1754f85f8324b4ba38fe9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83423e326108d9106f711e5b0aef6e56a4548416a5593f7bb2ab0e3c33776c4e",
+        "lastblockhash" : "0x020fc4ea2bf5eace55568c7ebd373b65f26c033248f19d6e75ec861b92c38b91",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -116,247 +116,13 @@
             }
         }
     },
-    "createJS_ExampleContract_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/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json",
-            "sourceHash" : "324be30c5ef3c335f3fd5ac41758c4661c73e3931528a5d6bb33fc58386274cf"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0927c0",
-                    "hash" : "0x263d73677752c87e5c30108cd98e42ae397366b88fc340c1208d352629ceb6fc",
-                    "mixHash" : "0x8235ce4ec4da97066572cba587b9a8bda2c63275bc9e4e8d415c32ea80140559",
-                    "nonce" : "0x6c4fbebb488bdf3a",
-                    "number" : "0x01",
-                    "parentHash" : "0x38850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458",
-                    "receiptTrie" : "0x3ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6",
-                    "stateRoot" : "0xd7ed1fb6756c97bd2bc6fb8732d8cf78ae8fc758fba75c142954556fdc056e5f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9065df901f8a038850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7ed1fb6756c97bd2bc6fb8732d8cf78ae8fc758fba75c142954556fdc056e5fa00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea03ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830927c08203e880a08235ce4ec4da97066572cba587b9a8bda2c63275bc9e4e8d415c32ea80140559886c4fbebb488bdf3af9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
-                        "gasLimit" : "0x0927c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282d",
-                        "s" : "0x415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x38850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe1a3750b19ae018e0179d9e5f2ab65af3afe10b15e1754f85f8324b4ba38fe9f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1a3750b19ae018e0179d9e5f2ab65af3afe10b15e1754f85f8324b4ba38fe9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x263d73677752c87e5c30108cd98e42ae397366b88fc340c1208d352629ceb6fc",
-        "network" : "EIP150",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd27c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x54c98c81"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e697840",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x54c98c81"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e72a000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createJS_ExampleContract_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/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json",
-            "sourceHash" : "324be30c5ef3c335f3fd5ac41758c4661c73e3931528a5d6bb33fc58386274cf"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0927c0",
-                    "hash" : "0x6d95a6b3bcf52cb4abf024876592f1aa30c0fca416359ba7abebbe23441b2dc3",
-                    "mixHash" : "0x601e28f99524a98181a05e3a9c7906170bde291f679fb6baf39070aae132f842",
-                    "nonce" : "0x74e42d18082c628c",
-                    "number" : "0x01",
-                    "parentHash" : "0x38850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458",
-                    "receiptTrie" : "0x3ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6",
-                    "stateRoot" : "0xd7ed1fb6756c97bd2bc6fb8732d8cf78ae8fc758fba75c142954556fdc056e5f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9065df901f8a038850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7ed1fb6756c97bd2bc6fb8732d8cf78ae8fc758fba75c142954556fdc056e5fa00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea03ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830927c08203e880a0601e28f99524a98181a05e3a9c7906170bde291f679fb6baf39070aae132f8428874e42d18082c628cf9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
-                        "gasLimit" : "0x0927c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282d",
-                        "s" : "0x415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x38850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe1a3750b19ae018e0179d9e5f2ab65af3afe10b15e1754f85f8324b4ba38fe9f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1a3750b19ae018e0179d9e5f2ab65af3afe10b15e1754f85f8324b4ba38fe9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d95a6b3bcf52cb4abf024876592f1aa30c0fca416359ba7abebbe23441b2dc3",
-        "network" : "EIP158",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd27c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x54c98c81"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e697840",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x54c98c81"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e72a000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createJS_ExampleContract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json",
-            "sourceHash" : "324be30c5ef3c335f3fd5ac41758c4661c73e3931528a5d6bb33fc58386274cf"
+            "sourceHash" : "c531ba16010a4148aeac458a52fd3d98770c4ef4f571fcd1508e179a44d5159b"
         },
         "blocks" : [
             {
@@ -367,9 +133,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "0x5f3e9bbaed525bc51a28538c2acfb43f1620034b7e3a2a1b0cdba8c6bdff6e0b",
-                    "mixHash" : "0x0d8a51f85cbe40b6fab9fa8696753f578a6f547cfaeeca61c92f079f768ebd89",
-                    "nonce" : "0x380d58a244436910",
+                    "hash" : "0x29c8f22a704a8f1f2a05f1047c132506802d7a78ac8eaec411e087d584e145b2",
+                    "mixHash" : "0x6d00a3fda5846eff3ab847f74078cbb3d24127af985f3aec2f161dd209d7c25d",
+                    "nonce" : "0xef3dc9762f18f1a6",
                     "number" : "0x01",
                     "parentHash" : "0x38850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458",
                     "receiptTrie" : "0x3ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6",
@@ -378,7 +144,7 @@
                     "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9065df901f8a038850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7ed1fb6756c97bd2bc6fb8732d8cf78ae8fc758fba75c142954556fdc056e5fa00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea03ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830927c08203e880a00d8a51f85cbe40b6fab9fa8696753f578a6f547cfaeeca61c92f079f768ebd8988380d58a244436910f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
+                "rlp" : "0xf9065df901f8a038850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7ed1fb6756c97bd2bc6fb8732d8cf78ae8fc758fba75c142954556fdc056e5fa00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea03ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830927c08203e880a06d00a3fda5846eff3ab847f74078cbb3d24127af985f3aec2f161dd209d7c25d88ef3dc9762f18f1a6f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
                 "transactions" : [
                     {
                         "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
@@ -415,7 +181,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1a3750b19ae018e0179d9e5f2ab65af3afe10b15e1754f85f8324b4ba38fe9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f3e9bbaed525bc51a28538c2acfb43f1620034b7e3a2a1b0cdba8c6bdff6e0b",
+        "lastblockhash" : "0x29c8f22a704a8f1f2a05f1047c132506802d7a78ac8eaec411e087d584e145b2",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -466,122 +232,5 @@
                 }
             }
         }
-    },
-    "createJS_ExampleContract_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json",
-            "sourceHash" : "324be30c5ef3c335f3fd5ac41758c4661c73e3931528a5d6bb33fc58386274cf"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0927c0",
-                    "hash" : "0x4e47273d1ad283d3c2422d399fc62c38eb2e63c871b341f7462cb1cdbb50252b",
-                    "mixHash" : "0x32b6c3dc536bb398055a3fc4d2316396a2a0dac2250eff58ece9f835b69d9ed1",
-                    "nonce" : "0xf7c488f60db6abb9",
-                    "number" : "0x01",
-                    "parentHash" : "0x38850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458",
-                    "receiptTrie" : "0x3ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6",
-                    "stateRoot" : "0xd7ed1fb6756c97bd2bc6fb8732d8cf78ae8fc758fba75c142954556fdc056e5f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9065df901f8a038850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d7ed1fb6756c97bd2bc6fb8732d8cf78ae8fc758fba75c142954556fdc056e5fa00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea03ac7edd793f591b8642798fdaa65929c5c0d90a6d7ad48c7b48142dd36343cd6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830927c08203e880a032b6c3dc536bb398055a3fc4d2316396a2a0dac2250eff58ece9f835b69d9ed188f7c488f60db6abb9f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
-                        "gasLimit" : "0x0927c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282d",
-                        "s" : "0x415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x38850b3326123466344e9b5eb824ecc05d158b66d7d10dda7103c9592a263458",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe1a3750b19ae018e0179d9e5f2ab65af3afe10b15e1754f85f8324b4ba38fe9f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e1a3750b19ae018e0179d9e5f2ab65af3afe10b15e1754f85f8324b4ba38fe9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e47273d1ad283d3c2422d399fc62c38eb2e63c871b341f7462cb1cdbb50252b",
-        "network" : "Homestead",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd27c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x54c98c81"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e697840",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x54c98c81"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e72a000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0.json
index c27e889ec..8cd0c32fd 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0.json
@@ -2,10 +2,10 @@
     "createJS_NoCollision_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json",
-            "sourceHash" : "543933a40cd8a849e80810617d377ed2d549bb59007c30c578f1fb8fc466e831"
+            "sourceHash" : "83a5d7900ff7c1a9e740d6aed66538b6160184e059fafca29423017c2fb45002"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061414",
-                    "hash" : "0xb99f12d221825d79af391c3417ef08bf123b22a59fd9f16bdcbd485c11b6faa0",
-                    "mixHash" : "0x89a1c0709ad25eaa3d3693ac0d10a2806a3838047de3179105ec2c6084ddca37",
-                    "nonce" : "0xfd48e340bd3b6d44",
+                    "hash" : "0x77e5b1c5c0bf0cb7112ad5e79aa428201028876e9bd39ea39d99d9c697905d6c",
+                    "mixHash" : "0xa43b2d41050f74cc20ffc87dab0a2e123977eaf1f5fd779fb97feace6edf8f48",
+                    "nonce" : "0x24be36ba515c71af",
                     "number" : "0x01",
                     "parentHash" : "0x9e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50",
                     "receiptTrie" : "0x691010ed0500e4d44ade320c2ab395deedd2a77d949805ac06e484b91758693c",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9065df901f8a09e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcc52187a3bb5938f2130b970c263b5b1c36e128426de26a5bc11a50008a802da00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea0691010ed0500e4d44ade320c2ab395deedd2a77d949805ac06e484b91758693cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830614148203e880a089a1c0709ad25eaa3d3693ac0d10a2806a3838047de3179105ec2c6084ddca3788fd48e340bd3b6d44f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
+                "rlp" : "0xf9065df901f8a09e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dcc52187a3bb5938f2130b970c263b5b1c36e128426de26a5bc11a50008a802da00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea0691010ed0500e4d44ade320c2ab395deedd2a77d949805ac06e484b91758693cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830614148203e880a0a43b2d41050f74cc20ffc87dab0a2e123977eaf1f5fd779fb97feace6edf8f488824be36ba515c71aff9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
                 "transactions" : [
                     {
                         "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb99f12d221825d79af391c3417ef08bf123b22a59fd9f16bdcbd485c11b6faa0",
+        "lastblockhash" : "0x77e5b1c5c0bf0cb7112ad5e79aa428201028876e9bd39ea39d99d9c697905d6c",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -104,223 +104,13 @@
             }
         }
     },
-    "createJS_NoCollision_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/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json",
-            "sourceHash" : "543933a40cd8a849e80810617d377ed2d549bb59007c30c578f1fb8fc466e831"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061414",
-                    "hash" : "0xd48abe8f9d19df476f88c87ac3e02e14501b346d1a2b43993fefcca148b63245",
-                    "mixHash" : "0x5c2593c6652645a6cfc019283754b05821b5d8679400921bea7bcc4acdca5bab",
-                    "nonce" : "0x36d27e7bad4c8c15",
-                    "number" : "0x01",
-                    "parentHash" : "0x9e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50",
-                    "receiptTrie" : "0x59d156a46e6c269cf41ace680845aa91088783d0efbffc350b4dd0b47b500a59",
-                    "stateRoot" : "0x17ba4a7a82148fe2436e63d3fc9c375acba500331fa0b479ff589a44fb358ed2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9065df901f8a09e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ba4a7a82148fe2436e63d3fc9c375acba500331fa0b479ff589a44fb358ed2a00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea059d156a46e6c269cf41ace680845aa91088783d0efbffc350b4dd0b47b500a59b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830614148203e880a05c2593c6652645a6cfc019283754b05821b5d8679400921bea7bcc4acdca5bab8836d27e7bad4c8c15f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
-                        "gasLimit" : "0x0927c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282d",
-                        "s" : "0x415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x9e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd48abe8f9d19df476f88c87ac3e02e14501b346d1a2b43993fefcca148b63245",
-        "network" : "EIP150",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fa1414",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x03e8"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e6b054c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e72a000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createJS_NoCollision_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/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json",
-            "sourceHash" : "543933a40cd8a849e80810617d377ed2d549bb59007c30c578f1fb8fc466e831"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061414",
-                    "hash" : "0xabf9921bd6700a5fdc20b6f5f6b3ef0b61f474784efca3814174abf3d9f9fa02",
-                    "mixHash" : "0x24cc13de6ebb7beb49f70d60b050355d6d422b1621940eafc55b8d1ed41f0791",
-                    "nonce" : "0xad1dcf15ae47e8a7",
-                    "number" : "0x01",
-                    "parentHash" : "0x9e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50",
-                    "receiptTrie" : "0x874940a5e10d4b03080816ebb4d5b556cb037918457d23075f319854f41cfe17",
-                    "stateRoot" : "0x5fbbd47d9d743deb6b1367af21c9f20a239e0329a6fe2b5ddc2d3a792ac22fe9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9065df901f8a09e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fbbd47d9d743deb6b1367af21c9f20a239e0329a6fe2b5ddc2d3a792ac22fe9a00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea0874940a5e10d4b03080816ebb4d5b556cb037918457d23075f319854f41cfe17b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830614148203e880a024cc13de6ebb7beb49f70d60b050355d6d422b1621940eafc55b8d1ed41f079188ad1dcf15ae47e8a7f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
-                        "gasLimit" : "0x0927c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282d",
-                        "s" : "0x415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x9e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xabf9921bd6700a5fdc20b6f5f6b3ef0b61f474784efca3814174abf3d9f9fa02",
-        "network" : "EIP158",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fa1414",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x03e8"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e6b054c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e72a000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createJS_NoCollision_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json",
-            "sourceHash" : "543933a40cd8a849e80810617d377ed2d549bb59007c30c578f1fb8fc466e831"
+            "sourceHash" : "83a5d7900ff7c1a9e740d6aed66538b6160184e059fafca29423017c2fb45002"
         },
         "blocks" : [
             {
@@ -331,9 +121,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x059714",
-                    "hash" : "0x85e1fe2610367d44f11a39a510ddd17d038b4a7ae8f8c2f4dcd15493aed1370c",
-                    "mixHash" : "0xea7a2ea4e2dcdaab1625a6f28c3fff0eb442078e60fcdef32eb2ee50013e3b3e",
-                    "nonce" : "0x2b4189b7545567d5",
+                    "hash" : "0x8a05d044c387f0a49204fb37d65be38c6c0d7ee5e0dfeea3ad6eec32555cc756",
+                    "mixHash" : "0x813c3f587e752872300ce71343a590e59a2a69b0e83bc3dc74eac859f326e4dc",
+                    "nonce" : "0x96c2f0ecebb5360f",
                     "number" : "0x01",
                     "parentHash" : "0x9e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50",
                     "receiptTrie" : "0xdffa8dba2d2bbec3c6e8139ba9aeea3e164a70343c70fdbe690224bfa37019e6",
@@ -342,7 +132,7 @@
                     "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9065df901f8a09e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099e0da50742cef79ccc1a55757764c237fa373fafb8f5427c788219b47b1f457a00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea0dffa8dba2d2bbec3c6e8139ba9aeea3e164a70343c70fdbe690224bfa37019e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830597148203e880a0ea7a2ea4e2dcdaab1625a6f28c3fff0eb442078e60fcdef32eb2ee50013e3b3e882b4189b7545567d5f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
+                "rlp" : "0xf9065df901f8a09e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa099e0da50742cef79ccc1a55757764c237fa373fafb8f5427c788219b47b1f457a00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea0dffa8dba2d2bbec3c6e8139ba9aeea3e164a70343c70fdbe690224bfa37019e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830597148203e880a0813c3f587e752872300ce71343a590e59a2a69b0e83bc3dc74eac859f326e4dc8896c2f0ecebb5360ff9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
                 "transactions" : [
                     {
                         "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
@@ -379,7 +169,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85e1fe2610367d44f11a39a510ddd17d038b4a7ae8f8c2f4dcd15493aed1370c",
+        "lastblockhash" : "0x8a05d044c387f0a49204fb37d65be38c6c0d7ee5e0dfeea3ad6eec32555cc756",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -418,110 +208,5 @@
                 }
             }
         }
-    },
-    "createJS_NoCollision_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json",
-            "sourceHash" : "543933a40cd8a849e80810617d377ed2d549bb59007c30c578f1fb8fc466e831"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x061414",
-                    "hash" : "0xc1c190f64a42b7bdfd5c1eac4d485f86965c6d617d5e49a6724a252819e7eed8",
-                    "mixHash" : "0x2b7b6f702bca19072cfe56ed19b93464fd53df665d880c315f3d7ce5798f905f",
-                    "nonce" : "0x893b24fabeeaf825",
-                    "number" : "0x01",
-                    "parentHash" : "0x9e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50",
-                    "receiptTrie" : "0x59d156a46e6c269cf41ace680845aa91088783d0efbffc350b4dd0b47b500a59",
-                    "stateRoot" : "0x17ba4a7a82148fe2436e63d3fc9c375acba500331fa0b479ff589a44fb358ed2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x0f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9065df901f8a09e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ba4a7a82148fe2436e63d3fc9c375acba500331fa0b479ff589a44fb358ed2a00f46cd87bb26b8752c4d35c5b54c80c860286c850aacadb5426d1c66d156156ea059d156a46e6c269cf41ace680845aa91088783d0efbffc350b4dd0b47b500a59b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830614148203e880a02b7b6f702bca19072cfe56ed19b93464fd53df665d880c315f3d7ce5798f905f88893b24fabeeaf825f9045ef9045b8001830927c080830186a0b9040a60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056000000000000000000000000000000000000000000000000000000000000004200000000000000000000000000000000000000000000000000000000000000231ca02bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282da0415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7c0",
-                "transactions" : [
-                    {
-                        "data" : "0x60406103ca600439600451602451336000819055506000600481905550816001819055508060028190555042600581905550336003819055505050610381806100496000396000f30060003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b505600000000000000000000000000000000000000000000000000000000000000420000000000000000000000000000000000000000000000000000000000000023",
-                        "gasLimit" : "0x0927c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2bd8d1699b0fda2b486c176076f8039ae0bec6bb7237c328033f89efc352282d",
-                        "s" : "0x415be60a0f371eac3b515ad6ee3c6a62d29d632e84194edb7087977df63afbf7",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x9e255347535da6ed0d790a8902a96f998981e2d22250d82d2fe9efbde0c5bd50",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dba07d6b448a186e9612e5f737d1c909dce473e53199901a302c00646d523c1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1c190f64a42b7bdfd5c1eac4d485f86965c6d617d5e49a6724a252819e7eed8",
-        "network" : "Homestead",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fa1414",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x01" : "0x42",
-                    "0x02" : "0x23",
-                    "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x05" : "0x03e8"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e6b054c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x09184e72a000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0.json
index 44ab9555d..74c2e1d84 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsNotEnoughGas_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "a1af2ba0efff90605363ccecbb71f7bf403c9a7d6651a6077e5f126f74a65fd5"
+            "sourceHash" : "bf2688bd4e6afbb52edc53f9b2bb0d50ce4804203abb7837c505b23be3957e07"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x00",
-                    "hash" : "0xeeb660e99eb1cd4a1b7b0d69f0b6b56b4c648ea8ed63183f8cfebe807801f457",
-                    "mixHash" : "0x9e6fd17ca158c9da1705eb28d7310e2a6861f6b4a5efe0f402ee26b5809ab9d0",
-                    "nonce" : "0x365fb3ef89b6f176",
+                    "hash" : "0xd5b0067d7982d8efa55e1ebc35872de1cb55e98f206711951e62c0da8fa16c8c",
+                    "mixHash" : "0x46adb7371d2d1b3b51e64afd110721f0be0d29f1c7e032874235f5a94442a222",
+                    "nonce" : "0xebb0ede8828027e8",
                     "number" : "0x01",
                     "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003a52e7b97df9552ad8f4307a30e0dd5fd1ad725daf3c7a2dcfdc28b591959eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a09e6fd17ca158c9da1705eb28d7310e2a6861f6b4a5efe0f402ee26b5809ab9d088365fb3ef89b6f176c0c0",
+                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003a52e7b97df9552ad8f4307a30e0dd5fd1ad725daf3c7a2dcfdc28b591959eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a046adb7371d2d1b3b51e64afd110721f0be0d29f1c7e032874235f5a94442a22288ebb0ede8828027e8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeeb660e99eb1cd4a1b7b0d69f0b6b56b4c648ea8ed63183f8cfebe807801f457",
+        "lastblockhash" : "0xd5b0067d7982d8efa55e1ebc35872de1cb55e98f206711951e62c0da8fa16c8c",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,177 +81,13 @@
             }
         }
     },
-    "createNameRegistratorPerTxsNotEnoughGas_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/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "a1af2ba0efff90605363ccecbb71f7bf403c9a7d6651a6077e5f126f74a65fd5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x5f4dcb79bb91af77697a8406beca24fd433609700d77ba03e7261ad7cac90ea7",
-                    "mixHash" : "0x28e862f2d4de97fdac56f96b5823685327375fffdbb1604c7f80576c53ed32fb",
-                    "nonce" : "0xd5fb77711bc48ea3",
-                    "number" : "0x01",
-                    "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a028e862f2d4de97fdac56f96b5823685327375fffdbb1604c7f80576c53ed32fb88d5fb77711bc48ea3c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x02540be400",
-            "gasUsed" : "0x00",
-            "hash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f4dcb79bb91af77697a8406beca24fd433609700d77ba03e7261ad7cac90ea7",
-        "network" : "EIP150",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createNameRegistratorPerTxsNotEnoughGas_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/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "a1af2ba0efff90605363ccecbb71f7bf403c9a7d6651a6077e5f126f74a65fd5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xe30aac3eefdfef9b03d5a611694d5e9567538fcd3696e6dfaadb49d1e8e0af45",
-                    "mixHash" : "0x007f28e870a161de6e538f8cf2a5114210cf6897752d490f2215b5bfc61d6786",
-                    "nonce" : "0xccc895f27d00d887",
-                    "number" : "0x01",
-                    "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a0007f28e870a161de6e538f8cf2a5114210cf6897752d490f2215b5bfc61d678688ccc895f27d00d887c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x02540be400",
-            "gasUsed" : "0x00",
-            "hash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe30aac3eefdfef9b03d5a611694d5e9567538fcd3696e6dfaadb49d1e8e0af45",
-        "network" : "EIP158",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createNameRegistratorPerTxsNotEnoughGas_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "a1af2ba0efff90605363ccecbb71f7bf403c9a7d6651a6077e5f126f74a65fd5"
+            "sourceHash" : "bf2688bd4e6afbb52edc53f9b2bb0d50ce4804203abb7837c505b23be3957e07"
         },
         "blocks" : [
             {
@@ -262,9 +98,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x00",
-                    "hash" : "0xaf29303d06e691b2c34027c2708b8eeac3f8ee7e7f88b882284f78b5c5b05baf",
-                    "mixHash" : "0x2d755248111768f50772f263134ad675ef751ebea2152a76081d6f8b50efa611",
-                    "nonce" : "0xe7dce48d7de416f4",
+                    "hash" : "0x1b1477227284a229163f62ce3aefe378ccac4c9bf81e9deea86663ab9badd1f7",
+                    "mixHash" : "0x3f54bde3c4a2d3dc6c27243bd594d847450b8892711427209aca264dc46a371e",
+                    "nonce" : "0xd88dc803276a6a65",
                     "number" : "0x01",
                     "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -273,7 +109,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a02d755248111768f50772f263134ad675ef751ebea2152a76081d6f8b50efa61188e7dce48d7de416f4c0c0",
+                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a03f54bde3c4a2d3dc6c27243bd594d847450b8892711427209aca264dc46a371e88d88dc803276a6a65c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -299,7 +135,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf29303d06e691b2c34027c2708b8eeac3f8ee7e7f88b882284f78b5c5b05baf",
+        "lastblockhash" : "0x1b1477227284a229163f62ce3aefe378ccac4c9bf81e9deea86663ab9badd1f7",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -326,87 +162,5 @@
                 }
             }
         }
-    },
-    "createNameRegistratorPerTxsNotEnoughGas_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "a1af2ba0efff90605363ccecbb71f7bf403c9a7d6651a6077e5f126f74a65fd5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x94bada3cf5557d8966cbcf9028b7df370d6771f9b364cb5eed497e6b50c2596d",
-                    "mixHash" : "0x46cf14bbb7153710c1df1c25609758a8a66481f321c5637e4780c6d535efed42",
-                    "nonce" : "0x3a184ad79f0ca1b0",
-                    "number" : "0x01",
-                    "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a046cf14bbb7153710c1df1c25609758a8a66481f321c5637e4780c6d535efed42883a184ad79f0ca1b0c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x02540be400",
-            "gasUsed" : "0x00",
-            "hash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94bada3cf5557d8966cbcf9028b7df370d6771f9b364cb5eed497e6b50c2596d",
-        "network" : "Homestead",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0.json
index 2b8855f8d..b2414c65e 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsNotEnoughGas_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json",
-            "sourceHash" : "bb25d5f9294bfafb91eea17883b5e4339e94e2245ac5be940e60137409213017"
+            "sourceHash" : "d3ce56ed468ad9fa79739eb9db00e97799471d7546d89019f57d030991d20ff8"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9c1aa00913511f1e3520d01a0a4afff4f0f23a151a6ce4216f900bedc3f74df9",
-                    "mixHash" : "0x0c270e4a78789a0b638246fa1a0f19b50acf52f624265ed036af1ee0cea7be41",
-                    "nonce" : "0x8f880420ce470f8c",
+                    "hash" : "0x093437cb55be34c76765bfe0ad899d99dc2126edc452c86a163dc3a45af1fc60",
+                    "mixHash" : "0xf182e62e2ba2fcd888df4c56229387b04968286591c84589b51178eaea950c58",
+                    "nonce" : "0x4062d0825b93ba09",
                     "number" : "0x01",
                     "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003a52e7b97df9552ad8f4307a30e0dd5fd1ad725daf3c7a2dcfdc28b591959eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a00c270e4a78789a0b638246fa1a0f19b50acf52f624265ed036af1ee0cea7be41888f880420ce470f8cc0c0",
+                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003a52e7b97df9552ad8f4307a30e0dd5fd1ad725daf3c7a2dcfdc28b591959eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a0f182e62e2ba2fcd888df4c56229387b04968286591c84589b51178eaea950c58884062d0825b93ba09c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c1aa00913511f1e3520d01a0a4afff4f0f23a151a6ce4216f900bedc3f74df9",
+        "lastblockhash" : "0x093437cb55be34c76765bfe0ad899d99dc2126edc452c86a163dc3a45af1fc60",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -80,352 +80,5 @@
                 }
             }
         }
-    },
-    "createNameRegistratorPerTxsNotEnoughGas_d0g1v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json",
-            "sourceHash" : "bb25d5f9294bfafb91eea17883b5e4339e94e2245ac5be940e60137409213017"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x7b8e45c04bbfe2f3bf8362f5a91ebdc221f61db82b962711decc451444df57d7",
-                    "mixHash" : "0xb3f6f0100250911110cdba468672f3f05c5d5dbd8a8b1a83f46c728751b83d08",
-                    "nonce" : "0xc0eb84f20052bec1",
-                    "number" : "0x01",
-                    "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a0b3f6f0100250911110cdba468672f3f05c5d5dbd8a8b1a83f46c728751b83d0888c0eb84f20052bec1c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x02540be400",
-            "gasUsed" : "0x00",
-            "hash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b8e45c04bbfe2f3bf8362f5a91ebdc221f61db82b962711decc451444df57d7",
-        "network" : "EIP150",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createNameRegistratorPerTxsNotEnoughGas_d0g1v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json",
-            "sourceHash" : "bb25d5f9294bfafb91eea17883b5e4339e94e2245ac5be940e60137409213017"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x542b6cb0ef605a2e9609f28a34050dedd31a3ce55b89d512f96cac6594534d71",
-                    "mixHash" : "0xacdb80bd0c65571c9aaac7202b4c28416a28ea1135f58f3478410a50f72bc54a",
-                    "nonce" : "0xd67e1d87a874f31a",
-                    "number" : "0x01",
-                    "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a0acdb80bd0c65571c9aaac7202b4c28416a28ea1135f58f3478410a50f72bc54a88d67e1d87a874f31ac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x02540be400",
-            "gasUsed" : "0x00",
-            "hash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x542b6cb0ef605a2e9609f28a34050dedd31a3ce55b89d512f96cac6594534d71",
-        "network" : "EIP158",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createNameRegistratorPerTxsNotEnoughGas_d0g1v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json",
-            "sourceHash" : "bb25d5f9294bfafb91eea17883b5e4339e94e2245ac5be940e60137409213017"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xa7ce",
-                    "hash" : "0x15404d882a064b1eebf9e25346938929172b6ca64a867f1c5adc01a684d6b3e2",
-                    "mixHash" : "0x48e3fb265fc10dea321ec78004cf4afa7543573090e165d7d7baf3cff1657bf0",
-                    "nonce" : "0xfc6d0832d1d8ca60",
-                    "number" : "0x01",
-                    "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-                    "receiptTrie" : "0x91968cdc33d454aaa868ee9874a76baac85149f58a5f2875f38c148d5459f203",
-                    "stateRoot" : "0x172578d0349c7800153aca67dc165c503b88510f49db8a8d3ef00488ca65fbf7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe6afa19cc021c1f05794bdad325af606de924d688fb6e7e819cf1a5778344659",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90270f901f9a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0172578d0349c7800153aca67dc165c503b88510f49db8a8d3ef00488ca65fbf7a0e6afa19cc021c1f05794bdad325af606de924d688fb6e7e819cf1a5778344659a091968cdc33d454aaa868ee9874a76baac85149f58a5f2875f38c148d5459f203b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082a7ce8203e880a048e3fb265fc10dea321ec78004cf4afa7543573090e165d7d7baf3cff1657bf088fc6d0832d1d8ca60f871f86f800182b44d80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba00392f7cd7402f0255dbd38da1fe447ff24fc066bab0b4529856e66dec6acaaa79f5e1be1c49a6ffcdb51b79144f9baee7f86ca1c37945d160c7b00c4dd9aecf8c0",
-                "transactions" : [
-                    {
-                        "data" : "0x6001600155601080600c6000396000f3006000355415600957005b60203560003555",
-                        "gasLimit" : "0xb44d",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x0392f7cd7402f0255dbd38da1fe447ff24fc066bab0b4529856e66dec6acaaa7",
-                        "s" : "0x5e1be1c49a6ffcdb51b79144f9baee7f86ca1c37945d160c7b00c4dd9aecf8",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x02540be400",
-            "gasUsed" : "0x00",
-            "hash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15404d882a064b1eebf9e25346938929172b6ca64a867f1c5adc01a684d6b3e2",
-        "network" : "Frontier",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a7ce",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761d192",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createNameRegistratorPerTxsNotEnoughGas_d0g1v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json",
-            "sourceHash" : "bb25d5f9294bfafb91eea17883b5e4339e94e2245ac5be940e60137409213017"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x9ac5b78cb045fc8fb3ebf99dff8e5ae294b5822d0a42fd138dcb09d9f699141b",
-                    "mixHash" : "0xd4d80c01bb0a0f34b7540b751e3288e807aefdde0bc827cf8de3810ed6ce5dfa",
-                    "nonce" : "0xd7fd8d08d2a83a8c",
-                    "number" : "0x01",
-                    "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901fcf901f7a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca71953bbea7b5f5021736ab59d23871136da4a3ab9c8a98d86f9f788ccf9ab8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be400808203e880a0d4d80c01bb0a0f34b7540b751e3288e807aefdde0bc827cf8de3810ed6ce5dfa88d7fd8d08d2a83a8cc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x02540be400",
-            "gasUsed" : "0x00",
-            "hash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ac5b78cb045fc8fb3ebf99dff8e5ae294b5822d0a42fd138dcb09d9f699141b",
-        "network" : "Homestead",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0.json
index 098449458..de7626a5f 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxs_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json",
-            "sourceHash" : "d9c15a2a2708013212ce10b989e31b00e415f16adfe2ad22d58033535f38bfbf"
+            "sourceHash" : "eb16fbfd421ff2e60754f93d4e4a74d1fa7ab062fa7459c55ee93a1ac3906d35"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x01314e",
-                    "hash" : "0x09713e56872603aadaf970b1892e5f7eaef0232c71453b82d37bde02a3e8b75b",
-                    "mixHash" : "0x5a988783d7b44ddedce8174ce4dcd06682cdcc0e244e5d3fd06f676c4ed4e355",
-                    "nonce" : "0x9958b9d4a5d61a16",
+                    "hash" : "0xdfa5826005baa3bfdd527c8ec44d81502aa824ee69cf4688d78efce33c689eba",
+                    "mixHash" : "0x4ae69e5ec40b1e9372ffb22d3cc4530d47e33ed6f48e1c8016366dc70e2e38ca",
+                    "nonce" : "0x53caea0d53dd9a09",
                     "number" : "0x01",
                     "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
                     "receiptTrie" : "0x3880809c6523d6d1f445d29969f2cf2917d82e9f5087823d866800e538400e52",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x57e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901faa01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051ecc163dc3b84c73f0539ed502d8f8f132ef442d5051497c4aeec8b87be6377a057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a03880809c6523d6d1f445d29969f2cf2917d82e9f5087823d866800e538400e52b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301314e8203e880a05a988783d7b44ddedce8174ce4dcd06682cdcc0e244e5d3fd06f676c4ed4e355889958b9d4a5d61a16f873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
+                "rlp" : "0xf90273f901faa01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051ecc163dc3b84c73f0539ed502d8f8f132ef442d5051497c4aeec8b87be6377a057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a03880809c6523d6d1f445d29969f2cf2917d82e9f5087823d866800e538400e52b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301314e8203e880a04ae69e5ec40b1e9372ffb22d3cc4530d47e33ed6f48e1c8016366dc70e2e38ca8853caea0d53dd9a09f873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600155601080600c6000396000f3006000355415600957005b60203560003555",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09713e56872603aadaf970b1892e5f7eaef0232c71453b82d37bde02a3e8b75b",
+        "lastblockhash" : "0xdfa5826005baa3bfdd527c8ec44d81502aa824ee69cf4688d78efce33c689eba",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -103,10 +103,10 @@
     "createNameRegistratorPerTxs_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json",
-            "sourceHash" : "d9c15a2a2708013212ce10b989e31b00e415f16adfe2ad22d58033535f38bfbf"
+            "sourceHash" : "eb16fbfd421ff2e60754f93d4e4a74d1fa7ab062fa7459c55ee93a1ac3906d35"
         },
         "blocks" : [
             {
@@ -117,9 +117,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x01314e",
-                    "hash" : "0xdc76a3d76d8da127a15940554d0a9972005c1e8f4cf4973cb701cac8c5f5e6dd",
-                    "mixHash" : "0xd587e917aacf60ceb29807ed3855f2ff1d1cc85fb83f89d817304923724065cf",
-                    "nonce" : "0xffdd233ea96f06fa",
+                    "hash" : "0xf5e12e5d9d03fddca257827a7f55747ceb60ec89c4e8a0f33ec2acafe5107c70",
+                    "mixHash" : "0x9aad9897557b17f672abb4eff2571dd1e7a8eb1a9f9c91bdfcf6c8808fefd737",
+                    "nonce" : "0x655ab46d4f1ab3f8",
                     "number" : "0x01",
                     "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
                     "receiptTrie" : "0xda18e22670b3b488e71415878b2138a33b8e9182c3d701c1588d4131b7d7edf8",
@@ -128,7 +128,7 @@
                     "transactionsTrie" : "0x57e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901faa01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b098b73a4b4a76bf20290c827ac95f616235cd130bb8c7784c4feda1553d16e9a057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a0da18e22670b3b488e71415878b2138a33b8e9182c3d701c1588d4131b7d7edf8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301314e8203e880a0d587e917aacf60ceb29807ed3855f2ff1d1cc85fb83f89d817304923724065cf88ffdd233ea96f06faf873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
+                "rlp" : "0xf90273f901faa01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b098b73a4b4a76bf20290c827ac95f616235cd130bb8c7784c4feda1553d16e9a057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a0da18e22670b3b488e71415878b2138a33b8e9182c3d701c1588d4131b7d7edf8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301314e8203e880a09aad9897557b17f672abb4eff2571dd1e7a8eb1a9f9c91bdfcf6c8808fefd73788655ab46d4f1ab3f8f873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600155601080600c6000396000f3006000355415600957005b60203560003555",
@@ -165,7 +165,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc76a3d76d8da127a15940554d0a9972005c1e8f4cf4973cb701cac8c5f5e6dd",
+        "lastblockhash" : "0xf5e12e5d9d03fddca257827a7f55747ceb60ec89c4e8a0f33ec2acafe5107c70",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -204,10 +204,10 @@
     "createNameRegistratorPerTxs_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json",
-            "sourceHash" : "d9c15a2a2708013212ce10b989e31b00e415f16adfe2ad22d58033535f38bfbf"
+            "sourceHash" : "eb16fbfd421ff2e60754f93d4e4a74d1fa7ab062fa7459c55ee93a1ac3906d35"
         },
         "blocks" : [
             {
@@ -218,9 +218,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x01314e",
-                    "hash" : "0x7ffa38de967a4a9059fa56eb544bde959b3c6677aaae79c11658ecb17018295d",
-                    "mixHash" : "0xc5fda2ebb95c725c9ceb51c277e6573c2c3dfd20b278ecd05d03b756372c7592",
-                    "nonce" : "0x20ec9ab4352d7e07",
+                    "hash" : "0xef77e15e2401d3728c5026e1c37b4c3a8221092561c67f99a96d0cb7d5f7b7b7",
+                    "mixHash" : "0xd07d952e7ec9075c6e3e01605373b149395ede3460aaef4640a8a038c1c1ac84",
+                    "nonce" : "0x4da287f5ffec691a",
                     "number" : "0x01",
                     "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
                     "receiptTrie" : "0x4a190f7f74fdd98462ee33cfbf15c57c7535970ac95641b4787099561b54eb9a",
@@ -229,7 +229,7 @@
                     "transactionsTrie" : "0x57e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90273f901faa01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c38432c5980221464014278315d03c85de325d3e97cf4efd5d77ec181c9b19ea057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a04a190f7f74fdd98462ee33cfbf15c57c7535970ac95641b4787099561b54eb9ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301314e8203e880a0c5fda2ebb95c725c9ceb51c277e6573c2c3dfd20b278ecd05d03b756372c75928820ec9ab4352d7e07f873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
+                "rlp" : "0xf90273f901faa01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c38432c5980221464014278315d03c85de325d3e97cf4efd5d77ec181c9b19ea057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a04a190f7f74fdd98462ee33cfbf15c57c7535970ac95641b4787099561b54eb9ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301314e8203e880a0d07d952e7ec9075c6e3e01605373b149395ede3460aaef4640a8a038c1c1ac84884da287f5ffec691af873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600155601080600c6000396000f3006000355415600957005b60203560003555",
@@ -266,7 +266,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ffa38de967a4a9059fa56eb544bde959b3c6677aaae79c11658ecb17018295d",
+        "lastblockhash" : "0xef77e15e2401d3728c5026e1c37b4c3a8221092561c67f99a96d0cb7d5f7b7b7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -305,10 +305,10 @@
     "createNameRegistratorPerTxs_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json",
-            "sourceHash" : "d9c15a2a2708013212ce10b989e31b00e415f16adfe2ad22d58033535f38bfbf"
+            "sourceHash" : "eb16fbfd421ff2e60754f93d4e4a74d1fa7ab062fa7459c55ee93a1ac3906d35"
         },
         "blocks" : [
             {
@@ -319,9 +319,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb44e",
-                    "hash" : "0x6acc3f4bd3581d3ace906ad15be5d8be6b73b9fd9125483271d69aa48a9b20d2",
-                    "mixHash" : "0x1c313cd4b668d88fcbb4364c00beeef4db2c5aa7ff36e7c1fe8aab6818637e49",
-                    "nonce" : "0xc14260d121a0ca6e",
+                    "hash" : "0x015a35968b7af5383c1fa5f07a6937c79a02efe532675e28c26f009db01ee6c9",
+                    "mixHash" : "0x0362d648c6eda732186ffc8eda54ff123374c982007f73d8663a7bd6ca8fe047",
+                    "nonce" : "0xb0002f6f702085bf",
                     "number" : "0x01",
                     "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
                     "receiptTrie" : "0xf2885e0771bd8fca92c52d28f79ae103b6d7006a56f6d13ac3eb40d927b1cdcd",
@@ -330,7 +330,7 @@
                     "transactionsTrie" : "0x57e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90272f901f9a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cd982564eedf2969c4dec1ec04330452a12fb4e40e80e6483685b1f054516a0a057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a0f2885e0771bd8fca92c52d28f79ae103b6d7006a56f6d13ac3eb40d927b1cdcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b44e8203e880a01c313cd4b668d88fcbb4364c00beeef4db2c5aa7ff36e7c1fe8aab6818637e4988c14260d121a0ca6ef873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
+                "rlp" : "0xf90272f901f9a01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cd982564eedf2969c4dec1ec04330452a12fb4e40e80e6483685b1f054516a0a057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a0f2885e0771bd8fca92c52d28f79ae103b6d7006a56f6d13ac3eb40d927b1cdcdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b44e8203e880a00362d648c6eda732186ffc8eda54ff123374c982007f73d8663a7bd6ca8fe04788b0002f6f702085bff873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600155601080600c6000396000f3006000355415600957005b60203560003555",
@@ -367,7 +367,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6acc3f4bd3581d3ace906ad15be5d8be6b73b9fd9125483271d69aa48a9b20d2",
+        "lastblockhash" : "0x015a35968b7af5383c1fa5f07a6937c79a02efe532675e28c26f009db01ee6c9",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -402,106 +402,5 @@
                 }
             }
         }
-    },
-    "createNameRegistratorPerTxs_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json",
-            "sourceHash" : "d9c15a2a2708013212ce10b989e31b00e415f16adfe2ad22d58033535f38bfbf"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x01314e",
-                    "hash" : "0xa970829b4fc3f32099b2cfeed497741380a66a18ea4cb22a50d229310d5af8c2",
-                    "mixHash" : "0x6f0d8a1b667fed75569bd490a914f792fd709df51f7f0d884aa9e1f8feadbca3",
-                    "nonce" : "0xd029f7858f8e2616",
-                    "number" : "0x01",
-                    "parentHash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-                    "receiptTrie" : "0xda18e22670b3b488e71415878b2138a33b8e9182c3d701c1588d4131b7d7edf8",
-                    "stateRoot" : "0xb098b73a4b4a76bf20290c827ac95f616235cd130bb8c7784c4feda1553d16e9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x57e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90273f901faa01e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b098b73a4b4a76bf20290c827ac95f616235cd130bb8c7784c4feda1553d16e9a057e145e810fd4e0699f320f49dedc139a87d8567921868842c93b3cd2c432ea5a0da18e22670b3b488e71415878b2138a33b8e9182c3d701c1588d4131b7d7edf8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008301314e8203e880a06f0d8a1b667fed75569bd490a914f792fd709df51f7f0d884aa9e1f8feadbca388d029f7858f8e2616f873f87180018301314e80830186a0a26001600155601080600c6000396000f3006000355415600957005b602035600035551ba09389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57a00e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4c0",
-                "transactions" : [
-                    {
-                        "data" : "0x6001600155601080600c6000396000f3006000355415600957005b60203560003555",
-                        "gasLimit" : "0x01314e",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x9389a7ae1b7f964e5a9f59f8ac38ac3ed6e4465e345999c8b36b5ba0845fea57",
-                        "s" : "0x0e110cde0059ae2a62be4283754c4143deac61954deaa17310c157b9849a42c4",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x02540be400",
-            "gasUsed" : "0x00",
-            "hash" : "0x1e6079f699d6f5cfe4eccf0985ac19d908b030e5cb8bfb5aa8a6b216b95e0be0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa970829b4fc3f32099b2cfeed497741380a66a18ea4cb22a50d229310d5af8c2",
-        "network" : "Homestead",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5314e",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x0186a0",
-                "code" : "0x396000f3006000355415600957005b60",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7614812",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0.json
index de5cbb3f1..6c2ef60c6 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPreStore1NotEnoughGas_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "2e8a064a3433e31aa082978eeb27f1c59bf3ad10e2393018071885baa5e88736"
+            "sourceHash" : "422f963b91e39f84a69c1f324d4bcc41a3530085ffa763ed7e2d1387092f44b6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011c37",
-                    "hash" : "0xb7448e9155f50e64e57538a8101a460792b3eb0139af96b042f3424af0eb80b5",
-                    "mixHash" : "0x6df69316443ad350b234aabc75b7c03304e4877f5c048113b183bb224b69f5d6",
-                    "nonce" : "0x85dd27bec3a39c76",
+                    "hash" : "0xe319f54864a64f7f73a26f08073fc46c22912fda467ef8bb37a815b2ca01b91b",
+                    "mixHash" : "0x1a1d88fdcee32137fa91f34f19a8b75c3b1fad2822bd191c31fe0c1bd6f5bbb0",
+                    "nonce" : "0x849424f88af0d807",
                     "number" : "0x01",
                     "parentHash" : "0x8a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbe",
                     "receiptTrie" : "0x262820f7255ac55c2e4bcbc683131951f28e84ac21928a7750fbc18f854f0be6",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x9a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a08a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab45917cc94f26638e3a0e92da902badcb4a475d2f38c4597cb0546ba26150b8a09a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377fa0262820f7255ac55c2e4bcbc683131951f28e84ac21928a7750fbc18f854f0be6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011c378203e880a06df69316443ad350b234aabc75b7c03304e4877f5c048113b183bb224b69f5d68885dd27bec3a39c76f865f863800183011d6f94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0e52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655a045ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aac0",
+                "rlp" : "0xf90264f901f9a08a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab45917cc94f26638e3a0e92da902badcb4a475d2f38c4597cb0546ba26150b8a09a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377fa0262820f7255ac55c2e4bcbc683131951f28e84ac21928a7750fbc18f854f0be6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011c378203e880a01a1d88fdcee32137fa91f34f19a8b75c3b1fad2822bd191c31fe0c1bd6f5bbb088849424f88af0d807f865f863800183011d6f94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0e52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655a045ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x011d6f",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8d0cfca23951546258f7b23c1d065c27168c009efa2d6ffed7240550d0be76fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7448e9155f50e64e57538a8101a460792b3eb0139af96b042f3424af0eb80b5",
+        "lastblockhash" : "0xe319f54864a64f7f73a26f08073fc46c22912fda467ef8bb37a815b2ca01b91b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createNameRegistratorPreStore1NotEnoughGas_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/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "2e8a064a3433e31aa082978eeb27f1c59bf3ad10e2393018071885baa5e88736"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011c37",
-                    "hash" : "0xedc28285a4009c7d37660160c25861b297c3eaf9bbb8c9ac7e0d5caa322f44af",
-                    "mixHash" : "0x005508e9dc9a1ae938a2aef6d1196e5a504a4a437b6daf7ebb8ba27f8b346f8f",
-                    "nonce" : "0x89d87d39686935a3",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbe",
-                    "receiptTrie" : "0xbfd72f6c8bd3ee5c948fe9fdb729465a2258a93e27d8d16280b51958a7e6d36c",
-                    "stateRoot" : "0x93ac3084a053e8726893a5ccca382deb1f3384361aef5af2a3e3a556772de8dc",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x9a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377f",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f9a08a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093ac3084a053e8726893a5ccca382deb1f3384361aef5af2a3e3a556772de8dca09a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377fa0bfd72f6c8bd3ee5c948fe9fdb729465a2258a93e27d8d16280b51958a7e6d36cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011c378203e880a0005508e9dc9a1ae938a2aef6d1196e5a504a4a437b6daf7ebb8ba27f8b346f8f8889d87d39686935a3f865f863800183011d6f94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0e52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655a045ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x011d6f",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xe52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655",
-                        "s" : "0x45ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aa",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbe",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe8d0cfca23951546258f7b23c1d065c27168c009efa2d6ffed7240550d0be76f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8d0cfca23951546258f7b23c1d065c27168c009efa2d6ffed7240550d0be76fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedc28285a4009c7d37660160c25861b297c3eaf9bbb8c9ac7e0d5caa322f44af",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153602260006017f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51c37",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7615d29",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153602260006017f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createNameRegistratorPreStore1NotEnoughGas_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/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "2e8a064a3433e31aa082978eeb27f1c59bf3ad10e2393018071885baa5e88736"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011c37",
-                    "hash" : "0x5923c078133190b4eae95e725af22a495872fa6c25f6d9a4928f34bcb59ee16d",
-                    "mixHash" : "0x4c21a45e2379872283f02990b3079bd6a16f1cad3a7aee2dd3bb584ac1eb4006",
-                    "nonce" : "0x75f69caf0abf9e04",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbe",
-                    "receiptTrie" : "0xbfd72f6c8bd3ee5c948fe9fdb729465a2258a93e27d8d16280b51958a7e6d36c",
-                    "stateRoot" : "0x93ac3084a053e8726893a5ccca382deb1f3384361aef5af2a3e3a556772de8dc",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x9a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377f",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f9a08a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093ac3084a053e8726893a5ccca382deb1f3384361aef5af2a3e3a556772de8dca09a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377fa0bfd72f6c8bd3ee5c948fe9fdb729465a2258a93e27d8d16280b51958a7e6d36cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011c378203e880a04c21a45e2379872283f02990b3079bd6a16f1cad3a7aee2dd3bb584ac1eb40068875f69caf0abf9e04f865f863800183011d6f94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0e52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655a045ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x011d6f",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xe52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655",
-                        "s" : "0x45ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aa",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbe",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe8d0cfca23951546258f7b23c1d065c27168c009efa2d6ffed7240550d0be76f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8d0cfca23951546258f7b23c1d065c27168c009efa2d6ffed7240550d0be76fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5923c078133190b4eae95e725af22a495872fa6c25f6d9a4928f34bcb59ee16d",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153602260006017f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51c37",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7615d29",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153602260006017f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createNameRegistratorPreStore1NotEnoughGas_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "2e8a064a3433e31aa082978eeb27f1c59bf3ad10e2393018071885baa5e88736"
+            "sourceHash" : "422f963b91e39f84a69c1f324d4bcc41a3530085ffa763ed7e2d1387092f44b6"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x011d6f",
-                    "hash" : "0xb0268d18ee714b126e91bdb77e12f090adab0e5549fb33fcc8ea686da9a86aaa",
-                    "mixHash" : "0x20b8eb7ce31069c1358a179523e521e241d4aa16c690e5e176593e3ebe68064f",
-                    "nonce" : "0x23e04dc157cc9b88",
+                    "hash" : "0x893975fccaa3369e6290919f11c4d024d3ccf35e862f798f34f3c42786511187",
+                    "mixHash" : "0x9762a93af3c1759ebbce111567349174974aac140fec667470c267d82a317965",
+                    "nonce" : "0x874b3b7412cbedec",
                     "number" : "0x01",
                     "parentHash" : "0x8a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbe",
                     "receiptTrie" : "0xf25c2f729e64e09302ef1166d107c434c94be73413739d29715f5ad6f4925f6f",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0x9a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a08a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b28f3b7c3637c54f6f98103bc45908dd2e7c9aa008984c8c08b324a02b5c988a09a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377fa0f25c2f729e64e09302ef1166d107c434c94be73413739d29715f5ad6f4925f6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011d6f8203e880a020b8eb7ce31069c1358a179523e521e241d4aa16c690e5e176593e3ebe68064f8823e04dc157cc9b88f865f863800183011d6f94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0e52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655a045ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aac0",
+                "rlp" : "0xf90264f901f9a08a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b28f3b7c3637c54f6f98103bc45908dd2e7c9aa008984c8c08b324a02b5c988a09a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377fa0f25c2f729e64e09302ef1166d107c434c94be73413739d29715f5ad6f4925f6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011d6f8203e880a09762a93af3c1759ebbce111567349174974aac140fec667470c267d82a31796588874b3b7412cbedecf865f863800183011d6f94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0e52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655a045ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x011d6f",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8d0cfca23951546258f7b23c1d065c27168c009efa2d6ffed7240550d0be76fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0268d18ee714b126e91bdb77e12f090adab0e5549fb33fcc8ea686da9a86aaa",
+        "lastblockhash" : "0x893975fccaa3369e6290919f11c4d024d3ccf35e862f798f34f3c42786511187",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createNameRegistratorPreStore1NotEnoughGas_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json",
-            "sourceHash" : "2e8a064a3433e31aa082978eeb27f1c59bf3ad10e2393018071885baa5e88736"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011d6f",
-                    "hash" : "0x2178b44de69a3acc45cb1c90d9f72422af55864925ae781a07922020b1330ace",
-                    "mixHash" : "0xffb06e9f79cee19a25bf50b92a7c7dc995881a775b7093a951c543b913fb937e",
-                    "nonce" : "0x0d7fea80fb6db232",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbe",
-                    "receiptTrie" : "0xf25c2f729e64e09302ef1166d107c434c94be73413739d29715f5ad6f4925f6f",
-                    "stateRoot" : "0x9b28f3b7c3637c54f6f98103bc45908dd2e7c9aa008984c8c08b324a02b5c988",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x9a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377f",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f9a08a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b28f3b7c3637c54f6f98103bc45908dd2e7c9aa008984c8c08b324a02b5c988a09a35ab835ac69cae038675cbd857d1588cf3bc6400652623a05536d372b4377fa0f25c2f729e64e09302ef1166d107c434c94be73413739d29715f5ad6f4925f6fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011d6f8203e880a0ffb06e9f79cee19a25bf50b92a7c7dc995881a775b7093a951c543b913fb937e880d7fea80fb6db232f865f863800183011d6f94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0e52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655a045ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x011d6f",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xe52a8786c301a23f49aba7106e9c9a71668d21bd67211f76ee996f9faba35655",
-                        "s" : "0x45ec70d8cede5a1995b23759cc81118ccd1e34b5903ddbc9ee2dfd7064ae06aa",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x05f5e100",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a386800cb6099a403879548cee1e5e26fe45e6cb57c428cbf9585e4c8fb5fbe",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe8d0cfca23951546258f7b23c1d065c27168c009efa2d6ffed7240550d0be76f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8d0cfca23951546258f7b23c1d065c27168c009efa2d6ffed7240550d0be76fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2178b44de69a3acc45cb1c90d9f72422af55864925ae781a07922020b1330ace",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153602260006017f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51d6f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7615bf1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153602260006017f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0.json
index 1070479e5..18fc56d11 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0.json
@@ -2,10 +2,10 @@
     "createNameRegistratorendowmentTooHigh_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json",
-            "sourceHash" : "08d5be8d737ec75a5899edf03447807377e50cc40b0d662059326d61deb8cd73"
+            "sourceHash" : "66a4227811e100d35761dfe23ca2e64f42e3410e2f34ce82551fa620aa4db46f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xe2a8",
-                    "hash" : "0xf6905c1d69dc69551466f52c57ca4d4eff41b46302cfa6d271ea8675880e4aa4",
-                    "mixHash" : "0x7331d95f724dcc42aaeb9a4486846384299899a556433ad86fc5eac8abe4e198",
-                    "nonce" : "0xe4cd04edbd440ef2",
+                    "hash" : "0x36b1a95e5fc587717a86cd20b606da4aeea746c8f6d494c24070d8415e2a649b",
+                    "mixHash" : "0x51ad315bb0b20525d6840d8a02747a01afbbd2834d2d064ebdff972157f2c894",
+                    "nonce" : "0x1b18370e6b88d013",
                     "number" : "0x01",
                     "parentHash" : "0x170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985",
                     "receiptTrie" : "0x7b07520dceef2728c1e1009285671ba24e179f44137ed03f4e34c81c46b99544",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xc3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b8f44386cdbadcd38096bef7ffc240441f1faef83f96de3b3864d28d1c27654a0c3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92aa07b07520dceef2728c1e1009285671ba24e179f44137ed03f4e34c81c46b99544b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082e2a88203e880a07331d95f724dcc42aaeb9a4486846384299899a556433ad86fc5eac8abe4e19888e4cd04edbd440ef2f862f8608001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0d6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923ea02496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173c0",
+                "rlp" : "0xf9025ff901f7a0170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b8f44386cdbadcd38096bef7ffc240441f1faef83f96de3b3864d28d1c27654a0c3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92aa07b07520dceef2728c1e1009285671ba24e179f44137ed03f4e34c81c46b99544b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082e2a88203e880a051ad315bb0b20525d6840d8a02747a01afbbd2834d2d064ebdff972157f2c894881b18370e6b88d013f862f8608001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0d6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923ea02496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0493e0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0064ec5bdd45715208270fdbc37e2bbff98b20045459710f372fd81276b218ec4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6905c1d69dc69551466f52c57ca4d4eff41b46302cfa6d271ea8675880e4aa4",
+        "lastblockhash" : "0x36b1a95e5fc587717a86cd20b606da4aeea746c8f6d494c24070d8415e2a649b",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -106,227 +106,13 @@
             }
         }
     },
-    "createNameRegistratorendowmentTooHigh_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/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json",
-            "sourceHash" : "08d5be8d737ec75a5899edf03447807377e50cc40b0d662059326d61deb8cd73"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xe2a8",
-                    "hash" : "0xd28001788b446b19ee087d32bd44caa2659f63acde6d18ec7b4ffcb9c55a86ba",
-                    "mixHash" : "0x25471b663efda0e010cc0b8a70559fc9acf1e2d3aac6f37d8697cadda3722b17",
-                    "nonce" : "0xe8c9d46347496865",
-                    "number" : "0x01",
-                    "parentHash" : "0x170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985",
-                    "receiptTrie" : "0xda60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159d",
-                    "stateRoot" : "0xb6710b28b0b24fea6c790c05cbb028f4ad558e567315ddfd506d783d56c627c7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xc3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92a",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a0170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6710b28b0b24fea6c790c05cbb028f4ad558e567315ddfd506d783d56c627c7a0c3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92aa0da60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082e2a88203e880a025471b663efda0e010cc0b8a70559fc9acf1e2d3aac6f37d8697cadda3722b1788e8c9d46347496865f862f8608001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0d6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923ea02496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0493e0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xd6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923e",
-                        "s" : "0x2496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x064ec5bdd45715208270fdbc37e2bbff98b20045459710f372fd81276b218ec4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0064ec5bdd45715208270fdbc37e2bbff98b20045459710f372fd81276b218ec4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd28001788b446b19ee087d32bd44caa2659f63acde6d18ec7b4ffcb9c55a86ba",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4e2a8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7631d58",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createNameRegistratorendowmentTooHigh_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/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json",
-            "sourceHash" : "08d5be8d737ec75a5899edf03447807377e50cc40b0d662059326d61deb8cd73"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xe2a8",
-                    "hash" : "0x59e1d0cbd26959f32946fa319d4a5ad58669cec881a34265979cff33a370256e",
-                    "mixHash" : "0x1e516eb9f31e6dc3ddb90c06ae5a0647fcc54be8845e70f07921ca7781f2740c",
-                    "nonce" : "0x891c0b79e09d2490",
-                    "number" : "0x01",
-                    "parentHash" : "0x170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985",
-                    "receiptTrie" : "0xda60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159d",
-                    "stateRoot" : "0xb6710b28b0b24fea6c790c05cbb028f4ad558e567315ddfd506d783d56c627c7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xc3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92a",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a0170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6710b28b0b24fea6c790c05cbb028f4ad558e567315ddfd506d783d56c627c7a0c3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92aa0da60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082e2a88203e880a01e516eb9f31e6dc3ddb90c06ae5a0647fcc54be8845e70f07921ca7781f2740c88891c0b79e09d2490f862f8608001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0d6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923ea02496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0493e0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xd6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923e",
-                        "s" : "0x2496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x064ec5bdd45715208270fdbc37e2bbff98b20045459710f372fd81276b218ec4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0064ec5bdd45715208270fdbc37e2bbff98b20045459710f372fd81276b218ec4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59e1d0cbd26959f32946fa319d4a5ad58669cec881a34265979cff33a370256e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4e2a8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7631d58",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createNameRegistratorendowmentTooHigh_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json",
-            "sourceHash" : "08d5be8d737ec75a5899edf03447807377e50cc40b0d662059326d61deb8cd73"
+            "sourceHash" : "66a4227811e100d35761dfe23ca2e64f42e3410e2f34ce82551fa620aa4db46f"
         },
         "blocks" : [
             {
@@ -337,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xe2a8",
-                    "hash" : "0xd0537904f01799e22549abdd063bd1c1b30eb2a901220ec76c9e7a34723a87c6",
-                    "mixHash" : "0x8088be162b940ce74f33949dcaabf2f6298517d669c61b3073687bff4c1cf25a",
-                    "nonce" : "0xe5b2ef94ab306a38",
+                    "hash" : "0xa74a4f7d81b2bee0825089623e635e95a1270aa84131906c9b80b283a08a6cad",
+                    "mixHash" : "0x4d1d3826f327b2f14bab1196abffcd9b5c6ea11b0e6c444bb54d8a3816f3d97d",
+                    "nonce" : "0x0810250cdc86bcfa",
                     "number" : "0x01",
                     "parentHash" : "0x170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985",
                     "receiptTrie" : "0xda60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159d",
@@ -348,10 +134,10 @@
                     "transactionsTrie" : "0xc3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6710b28b0b24fea6c790c05cbb028f4ad558e567315ddfd506d783d56c627c7a0c3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92aa0da60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082e2a88203e880a08088be162b940ce74f33949dcaabf2f6298517d669c61b3073687bff4c1cf25a88e5b2ef94ab306a38f862f8608001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0d6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923ea02496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173c0",
+                "rlp" : "0xf9025ff901f7a0170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6710b28b0b24fea6c790c05cbb028f4ad558e567315ddfd506d783d56c627c7a0c3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92aa0da60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082e2a88203e880a04d1d3826f327b2f14bab1196abffcd9b5c6ea11b0e6c444bb54d8a3816f3d97d880810250cdc86bcfaf862f8608001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0d6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923ea02496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0493e0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -385,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0064ec5bdd45715208270fdbc37e2bbff98b20045459710f372fd81276b218ec4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0537904f01799e22549abdd063bd1c1b30eb2a901220ec76c9e7a34723a87c6",
+        "lastblockhash" : "0xa74a4f7d81b2bee0825089623e635e95a1270aa84131906c9b80b283a08a6cad",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -426,112 +212,5 @@
                 }
             }
         }
-    },
-    "createNameRegistratorendowmentTooHigh_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json",
-            "sourceHash" : "08d5be8d737ec75a5899edf03447807377e50cc40b0d662059326d61deb8cd73"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xe2a8",
-                    "hash" : "0xadb61f0b938f4b114662501179cbcf5fd0eb5b196e3fd162e1a523ab7e15d3f9",
-                    "mixHash" : "0x51aa2782096feb6bb69b8f94933ccce87d21fc294c411825a7faf593507b9055",
-                    "nonce" : "0xe3bc39a52e253e01",
-                    "number" : "0x01",
-                    "parentHash" : "0x170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985",
-                    "receiptTrie" : "0xda60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159d",
-                    "stateRoot" : "0xb6710b28b0b24fea6c790c05cbb028f4ad558e567315ddfd506d783d56c627c7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xc3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92a",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a0170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6710b28b0b24fea6c790c05cbb028f4ad558e567315ddfd506d783d56c627c7a0c3953453d6e191fe948d6352579060fc87d6875c77fda38db3c8fa677a60c92aa0da60999891318176b2465dbed956b3076e4d848e7f84537ccb6c4f6a02d3159db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082e2a88203e880a051aa2782096feb6bb69b8f94933ccce87d21fc294c411825a7faf593507b905588e3bc39a52e253e01f862f8608001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0d6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923ea02496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0493e0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xd6f2a656b575bd1a8a30ae2ba81db8f1851af4f5a937ea92d8634124620e923e",
-                        "s" : "0x2496ad659174c2c02239c5e6fcff55a24623f24c32125ccee52f4ff5c8536173",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x170106eb49a06c056f28b2aec85e923c3ec97987f14925c7527a44e41d91c985",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x064ec5bdd45715208270fdbc37e2bbff98b20045459710f372fd81276b218ec4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0064ec5bdd45715208270fdbc37e2bbff98b20045459710f372fd81276b218ec4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xadb61f0b938f4b114662501179cbcf5fd0eb5b196e3fd162e1a523ab7e15d3f9",
-        "network" : "Homestead",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4e2a8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7631d58",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7c601080600c6000396000f3006000355415600957005b60203560003555600052601d6003670de0b6b3a7640001f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json
index 438ae6692..ac6af5d14 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,40 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json
index 44e59b4fa..f7d74aa40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,44 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01",
+                            "0x02" : "0x0fa3e9"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x85",
+                            "0x01" : "0x01",
+                            "0x02" : "0x020789"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x85",
+                            "0x01" : "0x01",
+                            "0x02" : "0x020789"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json
index 5ecdd4587..61bd028c7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,46 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x03e4",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x03e4",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json
index f0dcdd8c3..01040d13d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7fffffffffffffff",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,41 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x02" : "0x03e9"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x02" : "0x03e9"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x02" : "0x03e9"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json
index c073350d3..92ced26db 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,50 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                        "storage" : {
+                            "0x00" : "0x0400",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                        "storage" : {
+                            "0x00" : "0x0400",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                        "storage" : {
+                            "0x00" : "0x0400",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json
index 253f794bb..9766ee234 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,40 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json
index 954a65778..32e073720 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,44 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01",
+                            "0x02" : "0x0fa3e9"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x85",
+                            "0x01" : "0x01",
+                            "0x02" : "0x020789"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x85",
+                            "0x01" : "0x01",
+                            "0x02" : "0x020789"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json
index 656ea9ff4..010e5babe 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,37 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x02" : "0x03e9"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json
index 047ba37a8..8d8842ff9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json
index b3f7193ee..8011ef1ac 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json
index 4b893316c..12487d533 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json
index 7ee9a6d8a..c5418b6db 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json
index 57b9cb25d..9cbfb6e95 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json
index 0c4f967b2..5305dbb66 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json
index d08397318..6e66fa509 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,35 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json
index b54a15b4f..fb4020c28 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,44 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x456391824521c6c0"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af62c8290"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af62c8290"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json
index 0e03451f5..60b3704d7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,56 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                        "balance" : "0x17"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a763155a"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                        "balance" : "0x17"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a76312c6"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                        "balance" : "0x17"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a76312c6"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json
index a72d2b3b4..f34698931 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,35 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json
index 05c0429f7..aaee2fb7e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json
index b07d0d8e1..41d5f242c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json
index 013b5b55f..f71bf991d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json
index 16b05f7aa..760852ee4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json
index d5a431b96..24a73b51f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json
index 8bbdebaa5..a561cbf23 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0f4240",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json
index 86bda1b04..18a4b8371 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,35 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json
index 4c65b78b7..6a4e17fef 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,35 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json
index 353c1ffc8..08f986b98 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,30 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a7640017"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json
index dc6ea7c0f..a95602198 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,32 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json
index 95a3e27ca..4620509bc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,32 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json
index d289d0c9d..7ca330c67 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,32 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json
index 9f85c4812..4bdb332c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x05f5e100",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,32 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json
index 17319cc3e..abfb7eb4a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,30 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json
index ea4bbee4d..61ab2bb58 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1c",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,32 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "0x00"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json
index 67d64afd6..4350cbf47 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract_d0g0v0Filler.json
@@ -25,6 +25,53 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
+                        "storage" : {
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x01" : "0x42",
+                            "0x02" : "0x23",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x05" : "0x54c98c81"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
+                        "storage" : {
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x01" : "0x42",
+                            "0x02" : "0x23",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x05" : "0x54c98c81"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "code" : "0x60003560e060020a9004806343d726d61461004257806391b7f5ed14610050578063d686f9ee14610061578063f5bade661461006f578063fcfff16f1461008057005b61004a6101de565b60006000f35b61005b6004356100bf565b60006000f35b610069610304565b60006000f35b61007a60043561008e565b60006000f35b6100886100f0565b60006000f35b600054600160a060020a031633600160a060020a031614156100af576100b4565b6100bc565b806001819055505b50565b600054600160a060020a031633600160a060020a031614156100e0576100e5565b6100ed565b806002819055505b50565b600054600160a060020a031633600160a060020a031614806101255750600354600160a060020a031633600160a060020a0316145b61012e57610161565b60016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a16101dc565b60045460011480610173575060015434105b6101b85760016004819055507f59ebeb90bc63057b6515673c3ecf9438e5058bca0f92585014eced636878c9a560006000a142600581905550336003819055506101db565b33600160a060020a03166000346000600060006000848787f16101d757005b5050505b5b565b60006004546000146101ef576101f4565b610301565b600054600160a060020a031633600160a060020a031614801561022c5750600054600160a060020a0316600354600160a060020a0316145b61023557610242565b6000600481905550610301565b600354600160a060020a031633600160a060020a03161461026257610300565b600554420360025402905060015481116102c757600354600160a060020a0316600082600154036000600060006000848787f161029b57005b505050600054600160a060020a03166000826000600060006000848787f16102bf57005b5050506102ee565b600054600160a060020a031660006001546000600060006000848787f16102ea57005b5050505b60006004819055506000546003819055505b5b50565b6000600054600160a060020a031633600160a060020a031614156103275761032c565b61037e565b600554420360025402905060015481116103455761037d565b600054600160a060020a031660006001546000600060006000848787f161036857005b50505060006004819055506000546003819055505b5b5056",
+                        "storage" : {
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x01" : "0x42",
+                            "0x02" : "0x23",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x05" : "0x54c98c81"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json
index 42261374a..158045145 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision_d0g0v0Filler.json
@@ -25,6 +25,50 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "storage" : {
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x01" : "0x42",
+                            "0x02" : "0x23",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x05" : "0x03e8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "storage" : {
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x01" : "0x42",
+                            "0x02" : "0x23",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x05" : "0x03e8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "storage" : {
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x01" : "0x42",
+                            "0x02" : "0x23",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x05" : "0x03e8"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json
index b64b09dc1..627052372 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g0v0Filler.json
@@ -25,6 +25,35 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "nonce" : "0x00"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json
index cc742f2e8..1f26572fd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas_d0g1v0Filler.json
@@ -25,6 +25,26 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a7640000",
+                        "nonce" : "0x00"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json
index 0b74a01fa..1e9598059 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs_d0g0v0Filler.json
@@ -25,6 +25,60 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x0186a0",
+                        "code" : "0x396000f3006000355415600957005b60",
+                        "nonce" : "0x00",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x0186a0",
+                        "code" : "0x396000f3006000355415600957005b60",
+                        "nonce" : "0x00",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x0186a0",
+                        "code" : "0x396000f3006000355415600957005b60",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x0186a0",
+                        "code" : "0x396000f3006000355415600957005b60",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json
index da4d1b66d..ddb6b3222 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x011d6f",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,38 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json
index deea2119c..958bc1c8d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0493e0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,35 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",