update stInitCode test fillers

21 files changed, 224 insertions, 66 deletions

diff --git a/BlockchainTests/GeneralStateTests/stExample/add11_d0g0v0.json b/BlockchainTests/GeneralStateTests/stExample/add11_d0g0v0.json
index a82779026..3fd577afe 100644
--- a/BlockchainTests/GeneralStateTests/stExample/add11_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stExample/add11_d0g0v0.json
@@ -2,10 +2,10 @@
     "add11_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json",
-            "sourceHash" : "a2cee3b70c1e6bb9626237102fbf888a9a76db94594829379b3418a1aa9f8d08"
+            "sourceHash" : "9808cacd8f347355858cefd1d92ef14147e16909768505207c42e0340d4fb1b6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa034",
-                    "hash" : "0x4c077b212c4a9e09936049eb05d206ed0d1e79c8da984832ecd3d3f1b72444bb",
-                    "mixHash" : "0x2d81a5ed98c627b7e20d6f3663eec0ff104863ce50eed30ee9594804dfe12542",
-                    "nonce" : "0x06ba1bd9c301b911",
+                    "hash" : "0x758938e476972612fd1756c62b54ffb18f8c30b51c37d7ab25b94869e0f76e66",
+                    "mixHash" : "0x80fec5d1292bfe4fd831b54a7559389e5b98f13c2fce165cd3e246b228adc0c4",
+                    "nonce" : "0xf44b34eca2bf9916",
                     "number" : "0x01",
                     "parentHash" : "0x26f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625",
                     "receiptTrie" : "0x5a0b89fb1e5f44d02b5900c39683a1796c591b2c3b08e3b1bfc94f5aa4f3c44d",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x93ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b15e96a28489e2cf9e6458dd731ba124fe6f472c11417227e934a3f40af1bbfda093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba05a0b89fb1e5f44d02b5900c39683a1796c591b2c3b08e3b1bfc94f5aa4f3c44db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a02d81a5ed98c627b7e20d6f3663eec0ff104863ce50eed30ee9594804dfe125428806ba1bd9c301b911f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
+                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b15e96a28489e2cf9e6458dd731ba124fe6f472c11417227e934a3f40af1bbfda093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba05a0b89fb1e5f44d02b5900c39683a1796c591b2c3b08e3b1bfc94f5aa4f3c44db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a080fec5d1292bfe4fd831b54a7559389e5b98f13c2fce165cd3e246b228adc0c488f44b34eca2bf9916f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c077b212c4a9e09936049eb05d206ed0d1e79c8da984832ecd3d3f1b72444bb",
+        "lastblockhash" : "0x758938e476972612fd1756c62b54ffb18f8c30b51c37d7ab25b94869e0f76e66",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -110,10 +110,10 @@
     "add11_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json",
-            "sourceHash" : "a2cee3b70c1e6bb9626237102fbf888a9a76db94594829379b3418a1aa9f8d08"
+            "sourceHash" : "9808cacd8f347355858cefd1d92ef14147e16909768505207c42e0340d4fb1b6"
         },
         "blocks" : [
             {
@@ -124,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa034",
-                    "hash" : "0x4ef7290c1f7bf6254321258b8f1a9a45f3ef851f308e14aefbf263d0212e658b",
-                    "mixHash" : "0x4326f89f624e17a7ae99dd5a82afca7a6c72b01d7f67e0b5d153e250221a1274",
-                    "nonce" : "0xde28a59271e9c44b",
+                    "hash" : "0x50106805405bf5ebc16a242f7e274a0dce5960873bf3fa868faa1a9caaa85f99",
+                    "mixHash" : "0x7c3b23caa8f39774c0a5445e98b8f1b0a2c66ea63a495f5f142ca2b0d8d0641a",
+                    "nonce" : "0x1ea950b1ad40bbc6",
                     "number" : "0x01",
                     "parentHash" : "0x26f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625",
                     "receiptTrie" : "0xe151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644",
@@ -135,10 +135,10 @@
                     "transactionsTrie" : "0x93ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328f16ca7b0259d7617b3ddf711c107efe6d5785cbeb11a8ed1614b484a6bc3aa093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0e151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a04326f89f624e17a7ae99dd5a82afca7a6c72b01d7f67e0b5d153e250221a127488de28a59271e9c44bf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
+                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328f16ca7b0259d7617b3ddf711c107efe6d5785cbeb11a8ed1614b484a6bc3aa093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0e151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a07c3b23caa8f39774c0a5445e98b8f1b0a2c66ea63a495f5f142ca2b0d8d0641a881ea950b1ad40bbc6f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -172,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ef7290c1f7bf6254321258b8f1a9a45f3ef851f308e14aefbf263d0212e658b",
+        "lastblockhash" : "0x50106805405bf5ebc16a242f7e274a0dce5960873bf3fa868faa1a9caaa85f99",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -218,10 +218,10 @@
     "add11_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json",
-            "sourceHash" : "a2cee3b70c1e6bb9626237102fbf888a9a76db94594829379b3418a1aa9f8d08"
+            "sourceHash" : "9808cacd8f347355858cefd1d92ef14147e16909768505207c42e0340d4fb1b6"
         },
         "blocks" : [
             {
@@ -232,9 +232,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa034",
-                    "hash" : "0x346a7ca3fdd3ab3e7f809dd19aed0e93dcf1ea4037bac4fe4757d569313be72e",
-                    "mixHash" : "0x49610640316589bea155c2abef30c3d2a8c09239423b438b52f375587303386c",
-                    "nonce" : "0xed7e1032f1350001",
+                    "hash" : "0xfa76558516f8cd70f851d3902643a2104b57590e0b3a17e07e935c3e9842ba8d",
+                    "mixHash" : "0x6678a7875d402f7626e5622b6ed4e58b019773f690833a91fd222380ca46674f",
+                    "nonce" : "0x2236e614043d92c0",
                     "number" : "0x01",
                     "parentHash" : "0x26f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625",
                     "receiptTrie" : "0xe151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644",
@@ -243,10 +243,10 @@
                     "transactionsTrie" : "0x93ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328f16ca7b0259d7617b3ddf711c107efe6d5785cbeb11a8ed1614b484a6bc3aa093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0e151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a049610640316589bea155c2abef30c3d2a8c09239423b438b52f375587303386c88ed7e1032f1350001f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
+                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328f16ca7b0259d7617b3ddf711c107efe6d5785cbeb11a8ed1614b484a6bc3aa093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0e151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a06678a7875d402f7626e5622b6ed4e58b019773f690833a91fd222380ca46674f882236e614043d92c0f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -280,7 +280,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x346a7ca3fdd3ab3e7f809dd19aed0e93dcf1ea4037bac4fe4757d569313be72e",
+        "lastblockhash" : "0xfa76558516f8cd70f851d3902643a2104b57590e0b3a17e07e935c3e9842ba8d",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -326,10 +326,10 @@
     "add11_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json",
-            "sourceHash" : "a2cee3b70c1e6bb9626237102fbf888a9a76db94594829379b3418a1aa9f8d08"
+            "sourceHash" : "9808cacd8f347355858cefd1d92ef14147e16909768505207c42e0340d4fb1b6"
         },
         "blocks" : [
             {
@@ -340,9 +340,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa034",
-                    "hash" : "0x8d852ed89e3e57fd7589a5f6cec203f12f55bde6466702763f9bdd0cc6576b38",
-                    "mixHash" : "0xa8c214bc5e5203f744d103fd84bff08fe4e1e02568457617ec872d59b2ed857a",
-                    "nonce" : "0xad1ac890a171737c",
+                    "hash" : "0xa24cbf8fea459422a532461b46c50276be60464dd0b9b87869258cf0170a6c75",
+                    "mixHash" : "0xafbd86ac343b8cbb61883e014a8ceaa8b45bcf5aaf2bd5c56ebb012d97589085",
+                    "nonce" : "0x3ebe416377e22af1",
                     "number" : "0x01",
                     "parentHash" : "0x26f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625",
                     "receiptTrie" : "0xe151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644",
@@ -351,10 +351,10 @@
                     "transactionsTrie" : "0x93ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328f16ca7b0259d7617b3ddf711c107efe6d5785cbeb11a8ed1614b484a6bc3aa093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0e151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a0a8c214bc5e5203f744d103fd84bff08fe4e1e02568457617ec872d59b2ed857a88ad1ac890a171737cf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
+                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328f16ca7b0259d7617b3ddf711c107efe6d5785cbeb11a8ed1614b484a6bc3aa093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0e151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a0afbd86ac343b8cbb61883e014a8ceaa8b45bcf5aaf2bd5c56ebb012d97589085883ebe416377e22af1f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -388,7 +388,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d852ed89e3e57fd7589a5f6cec203f12f55bde6466702763f9bdd0cc6576b38",
+        "lastblockhash" : "0xa24cbf8fea459422a532461b46c50276be60464dd0b9b87869258cf0170a6c75",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -434,10 +434,10 @@
     "add11_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json",
-            "sourceHash" : "a2cee3b70c1e6bb9626237102fbf888a9a76db94594829379b3418a1aa9f8d08"
+            "sourceHash" : "9808cacd8f347355858cefd1d92ef14147e16909768505207c42e0340d4fb1b6"
         },
         "blocks" : [
             {
@@ -448,9 +448,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa034",
-                    "hash" : "0xd51e0e81bb122f9073b74373d1192c535b31f0f18ec73a9c53fc77fc5acf6b54",
-                    "mixHash" : "0x83d02bf3592fae6e263cdd9f9fd22acd5591b51456d0875cf05574851200be44",
-                    "nonce" : "0x61925d3ba4cab413",
+                    "hash" : "0x86fa1e78d0a52de0caf833e681d8da8628a1966cb5c798ed494166c0d80c5d3a",
+                    "mixHash" : "0xad509ec118406332ed37f86a4c7c4e07ff58b5123c7eafde5f4d77692239ed56",
+                    "nonce" : "0xb92351c7395c7fbb",
                     "number" : "0x01",
                     "parentHash" : "0x26f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625",
                     "receiptTrie" : "0xe151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644",
@@ -459,10 +459,10 @@
                     "transactionsTrie" : "0x93ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328f16ca7b0259d7617b3ddf711c107efe6d5785cbeb11a8ed1614b484a6bc3aa093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0e151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a083d02bf3592fae6e263cdd9f9fd22acd5591b51456d0875cf05574851200be448861925d3ba4cab413f865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
+                "rlp" : "0xf90262f901f7a026f4cb1cb9685bad697c0c16ca0d27fe0a4b09364f83ed8418cef0d523783625a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328f16ca7b0259d7617b3ddf711c107efe6d5785cbeb11a8ed1614b484a6bc3aa093ca2a18d52e7c1846f7b104e2fc1e5fdc71ebe38187248f9437d39e74f43aaba0e151c94b824bded58346fa03fc91fa275bd0cf94caac0ea4ebb9c8d32a574644b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a0348203e880a0ad509ec118406332ed37f86a4c7c4e07ff58b5123c7eafde5f4d77692239ed5688b92351c7395c7fbbf865f863800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0e94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3a01fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540cc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -496,7 +496,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd51e0e81bb122f9073b74373d1192c535b31f0f18ec73a9c53fc77fc5acf6b54",
+        "lastblockhash" : "0x86fa1e78d0a52de0caf833e681d8da8628a1966cb5c798ed494166c0d80c5d3a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/GeneralStateTests/stExample/add11.json b/GeneralStateTests/stExample/add11.json
index aeefb97f8..3689d7a4e 100644
--- a/GeneralStateTests/stExample/add11.json
+++ b/GeneralStateTests/stExample/add11.json
@@ -2,10 +2,10 @@
     "add11" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.f8b764e7.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
             "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stExample/add11Filler.json",
-            "sourceHash" : "38110d47094078cf20957015ca3ff363288aa38dc9b7ad8445c42d83fbaa81a3"
+            "sourceHash" : "ac776717455a87fb31680493a85b495802d226c6691cdb5c8bddb810c9f5fbea"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json
index 8fafc6603..539c0b5ae 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExample/add11_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,164 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a76586a0",
+                        "code" : "0x6001600101600055",
+                        "storage" : {
+                            "0x00" : "0x02"
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244f4a034",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a761d92c",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a76586a0",
+                        "code" : "0x6001600101600055",
+                        "storage" : {
+                            "0x00" : "0x02"
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244f4a034",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a761d92c",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a76586a0",
+                        "code" : "0x6001600101600055",
+                        "storage" : {
+                            "0x00" : "0x02"
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244f4a034",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a761d92c",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a76586a0",
+                        "code" : "0x6001600101600055",
+                        "storage" : {
+                            "0x00" : "0x02"
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244f4a034",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a761d92c",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a76586a0",
+                        "code" : "0x6001600101600055",
+                        "storage" : {
+                            "0x00" : "0x02"
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af62ca034",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a761d92c",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a76586a0",
+                        "code" : "0x6001600101600055",
+                        "storage" : {
+                            "0x00" : "0x02"
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af62ca034",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a761d92c",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json
index 8c511bf66..378e6ef63 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractAndCallItOOGFiller.json
@@ -41,7 +41,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
index a0533aa3c..23235daea 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractNoCashFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier","Homestead", "EIP158", "EIP150"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
index dfbf80289..d9dd98316 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGBonusGasFiller.json
@@ -41,7 +41,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json
index 9ef2ab604..702d76714 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier","Homestead", "EIP158", "EIP150"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
index e799477b6..8d8583f7c 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
@@ -44,7 +44,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
index 160863992..53cb74532 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCodeFiller.json
@@ -41,7 +41,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json
index 90558c260..075c1bfa8 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallRecursiveContractFiller.json
@@ -44,7 +44,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json
index e776ab58b..7e0692ba0 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/CallTheContractToCreateEmptyContractFiller.json
@@ -39,7 +39,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json
index 416a9e580..acee81b7d 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/NotEnoughCashContractCreationFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier","Homestead", "EIP158", "EIP150"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "22177"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json
index 7e6de73af..086e0ec2b 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasContractCreationFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : [">=Homestead"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1000000"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json
index fb4cf51e0..59a0e33e9 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/OutOfGasPrefundedContractCreationFiller.json
@@ -35,7 +35,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP158", "EIP150"],
+                "network" : [">=Homestead"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 	"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json
index be99819c0..db135a323 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTest2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier","Homestead", "EIP158", "EIP150"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json
index 487d2173c..a028ed499 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/ReturnTestFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier","Homestead", "EIP158", "EIP150"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json
index d263532e4..34d733b26 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/StackUnderFlowContractCreationFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier","Homestead", "EIP158", "EIP150"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "72000"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json
index e9522b400..e3208b6fc 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateAutoSuicideContractFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158", "EIP150"],
+                "network" : [">=EIP150"],
                 "result" : {
                     "0000000000000000000000000000000000000000" : {
                         "shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json
index 700d303f4..cc75f56d0 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateRandomInitCodeFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier","Homestead", "EIP158", "EIP150"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "64599"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json
index 5f06d44a6..0d213d32b 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateStopInInitcodeFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Byzantium"],
+                "network" : [">=Byzantium"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json
index 7e3429c17..b850e24e2 100644
--- a/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json
+++ b/src/GeneralStateTestsFiller/stInitCodeTest/TransactionCreateSuicideInInitcodeFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier","Homestead", "EIP158", "EIP150"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "55000"