28 files changed, 0 insertions, 2705 deletions
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v0.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v0.json
deleted file mode 100644
index 83c03af47..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v0.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "callNonConst_d1g0v0_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v0Filler.json",
-            "sourceHash" : "c8befd3724d9ffc4df397b35d4679544bffbec06722bd42a8ba2dfe22f931c86"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xaefc",
-                    "hash" : "0x824e6f6231a9a2f28d7d20617f2c9d7570f1b53ff654469242b5a9ec62742e41",
-                    "mixHash" : "0x6f18611d6c81f9bff257aa50feb3dc5f7ef35f4899bbe950eb7ebf58ed3e636d",
-                    "nonce" : "0xfe73e48de8ecf069",
-                    "number" : "0x01",
-                    "parentHash" : "0x2f80ff435dcd7ce510dba9ae93df29965673c2fdc3556cccb4f5bb7a28ac6b20",
-                    "receiptTrie" : "0x03d1f2127344956e6dc399e01a602753bd70defecebb7115bea54f7b51597de4",
-                    "stateRoot" : "0x5ac417cc62c336105d437a85e17f863ccc7a5e8b9bba713f07514aac0ea126eb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xf69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a02f80ff435dcd7ce510dba9ae93df29965673c2fdc3556cccb4f5bb7a28ac6b20a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ac417cc62c336105d437a85e17f863ccc7a5e8b9bba713f07514aac0ea126eba0f69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76a003d1f2127344956e6dc399e01a602753bd70defecebb7115bea54f7b51597de4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082aefc8203e880a06f18611d6c81f9bff257aa50feb3dc5f7ef35f4899bbe950eb7ebf58ed3e636d88fe73e48de8ecf069f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d878084112233441ba01aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962ba015c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x2f80ff435dcd7ce510dba9ae93df29965673c2fdc3556cccb4f5bb7a28ac6b20",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4f3fe7f5f0d365f931c147494bb4799912d8bec3bd57e670b9b548f068e29d10",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3fe7f5f0d365f931c147494bb4799912d8bec3bd57e670b9b548f068e29d10a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x824e6f6231a9a2f28d7d20617f2c9d7570f1b53ff654469242b5a9ec62742e41",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62caefc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635104",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v1.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v1.json
deleted file mode 100644
index b3ddecc3d..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v1.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "callNonConst_d1g0v1_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v1Filler.json",
-            "sourceHash" : "a491e62b9c75e63d3a23d243433b9ca684741680c32ab7db6aecde4a4a034f8f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xf938",
-                    "hash" : "0xc6939823f54ef029ef69e640bcf30e9436c8deaff01f722890eceb41cbd9a4aa",
-                    "mixHash" : "0xe0b2c08a7b77995c2460743764b98cb5cf2b279388bd337bad31d25559852b18",
-                    "nonce" : "0xb1df8d597a0d0b24",
-                    "number" : "0x01",
-                    "parentHash" : "0x2f80ff435dcd7ce510dba9ae93df29965673c2fdc3556cccb4f5bb7a28ac6b20",
-                    "receiptTrie" : "0xb05c5feadc2c71974113872c8900d7f9baf8a788cb81681a529bf17bdbb3f515",
-                    "stateRoot" : "0xf485ac58abc6c6fadfcaff3f4bf88cdc806f62292961eaa80ad307a42738b46d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a02f80ff435dcd7ce510dba9ae93df29965673c2fdc3556cccb4f5bb7a28ac6b20a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f485ac58abc6c6fadfcaff3f4bf88cdc806f62292961eaa80ad307a42738b46da0b37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4a0b05c5feadc2c71974113872c8900d7f9baf8a788cb81681a529bf17bdbb3f515b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082f9388203e880a0e0b2c08a7b77995c2460743764b98cb5cf2b279388bd337bad31d25559852b1888b1df8d597a0d0b24f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d870184112233441ca02422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072a03bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x2f80ff435dcd7ce510dba9ae93df29965673c2fdc3556cccb4f5bb7a28ac6b20",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4f3fe7f5f0d365f931c147494bb4799912d8bec3bd57e670b9b548f068e29d10",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3fe7f5f0d365f931c147494bb4799912d8bec3bd57e670b9b548f068e29d10a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6939823f54ef029ef69e640bcf30e9436c8deaff01f722890eceb41cbd9a4aa",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x01",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cf938",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76306c7",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v0.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v0.json
deleted file mode 100644
index 893256f9f..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v0.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "callcodeNonConst_d1g0v0_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v0Filler.json",
-            "sourceHash" : "7f81119eab30d227ca38944b5c024cb60e3ac9fd77d3813ab71ceb725345ddef"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xaefc",
-                    "hash" : "0xe6b14ae02353222e41d1219bf597bc1f2a2cba5cd38e01a5d9e0a6ffdd1feccc",
-                    "mixHash" : "0x7aa1d9469df6c75c0400e8f404d351a3bb7a638acdd437611624780f5bb07196",
-                    "nonce" : "0xce4f37e02285a5a5",
-                    "number" : "0x01",
-                    "parentHash" : "0x3cc57e4daf4aab3097f3e7613b2463eb939a29f13e45e3824c0569ec5d822613",
-                    "receiptTrie" : "0x03d1f2127344956e6dc399e01a602753bd70defecebb7115bea54f7b51597de4",
-                    "stateRoot" : "0x16fac949ace6eee74c8ceef4752034bdd7ccb69630573223e92c4014f53fcbd2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xf69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a03cc57e4daf4aab3097f3e7613b2463eb939a29f13e45e3824c0569ec5d822613a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fac949ace6eee74c8ceef4752034bdd7ccb69630573223e92c4014f53fcbd2a0f69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76a003d1f2127344956e6dc399e01a602753bd70defecebb7115bea54f7b51597de4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082aefc8203e880a07aa1d9469df6c75c0400e8f404d351a3bb7a638acdd437611624780f5bb0719688ce4f37e02285a5a5f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d878084112233441ba01aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962ba015c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x3cc57e4daf4aab3097f3e7613b2463eb939a29f13e45e3824c0569ec5d822613",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5674281e986b81784ec1be2147be8652b7310cd8e37fee79c8552cededd5a02e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05674281e986b81784ec1be2147be8652b7310cd8e37fee79c8552cededd5a02ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6b14ae02353222e41d1219bf597bc1f2a2cba5cd38e01a5d9e0a6ffdd1feccc",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62caefc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635104",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v1.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v1.json
deleted file mode 100644
index ecc153ea1..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v1.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "callcodeNonConst_d1g0v1_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v1Filler.json",
-            "sourceHash" : "f4f6b5e4bf1a4599846ec6f9ad53f340f3d87e9c791ef5cb3a99a8de6b326762"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9790",
-                    "hash" : "0x02b4b9aef87241956547674e61d5411f7b77f7f11632c0a1a59f6c8d4217ba0a",
-                    "mixHash" : "0xc21b69c40f3bab3355c5d47dfcc71ae4348412b7bdeb516efc334dced64dd0a3",
-                    "nonce" : "0xa4bb2df1a3a2c016",
-                    "number" : "0x01",
-                    "parentHash" : "0x3cc57e4daf4aab3097f3e7613b2463eb939a29f13e45e3824c0569ec5d822613",
-                    "receiptTrie" : "0xda571621115e8996224ae2717c0be4ebb316497b096c66abc9c24b1007ca46a8",
-                    "stateRoot" : "0x1b8ab6e68d557bdeea0dfc23013f5a5ba7e95fc8cfdd3346a831bc848adebf97",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a03cc57e4daf4aab3097f3e7613b2463eb939a29f13e45e3824c0569ec5d822613a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b8ab6e68d557bdeea0dfc23013f5a5ba7e95fc8cfdd3346a831bc848adebf97a0b37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4a0da571621115e8996224ae2717c0be4ebb316497b096c66abc9c24b1007ca46a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408297908203e880a0c21b69c40f3bab3355c5d47dfcc71ae4348412b7bdeb516efc334dced64dd0a388a4bb2df1a3a2c016f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d870184112233441ca02422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072a03bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x3cc57e4daf4aab3097f3e7613b2463eb939a29f13e45e3824c0569ec5d822613",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5674281e986b81784ec1be2147be8652b7310cd8e37fee79c8552cededd5a02e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05674281e986b81784ec1be2147be8652b7310cd8e37fee79c8552cededd5a02ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02b4b9aef87241956547674e61d5411f7b77f7f11632c0a1a59f6c8d4217ba0a",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x01",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c9790",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763686f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v0.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v0.json
deleted file mode 100644
index 410eca609..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "codecopyNonConst_d1g0v0_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v0Filler.json",
-            "sourceHash" : "96b8b15da3e554446713debcf4d0b2edff2fca54d295681edb5d0f8f7d1d7ea4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x57d4",
-                    "hash" : "0x32562f2ef168a8fcc7bcd838b10bd6b09a26e09d8d5a926f83e5137cef2bcb69",
-                    "mixHash" : "0xa0d8046262412a3c025e5de6f2be460723a8028c07ab9a74a30fdf94b097ed5a",
-                    "nonce" : "0x86af19faf3846ceb",
-                    "number" : "0x01",
-                    "parentHash" : "0xcfbb0091e5cf15042ee9a5cb54844f02f22d89d9d2c7675070cd5b6e64b179e3",
-                    "receiptTrie" : "0x15bfa02013b7e7ca2ced4ac0681563f5a5057f0c31c40ddb0a4d226f3713f34a",
-                    "stateRoot" : "0x5e4e56fe77f19aad5ebad4af4c759578c1be0d1ab87ea1e4959826655878780b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xf69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a0cfbb0091e5cf15042ee9a5cb54844f02f22d89d9d2c7675070cd5b6e64b179e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e4e56fe77f19aad5ebad4af4c759578c1be0d1ab87ea1e4959826655878780ba0f69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76a015bfa02013b7e7ca2ced4ac0681563f5a5057f0c31c40ddb0a4d226f3713f34ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408257d48203e880a0a0d8046262412a3c025e5de6f2be460723a8028c07ab9a74a30fdf94b097ed5a8886af19faf3846cebf866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d878084112233441ba01aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962ba015c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcfbb0091e5cf15042ee9a5cb54844f02f22d89d9d2c7675070cd5b6e64b179e3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9b5eeb6214dd8c108a8cb7668888f29051fc86e258d56a93766ed39d79c3672f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b5eeb6214dd8c108a8cb7668888f29051fc86e258d56a93766ed39d79c3672fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x32562f2ef168a8fcc7bcd838b10bd6b09a26e09d8d5a926f83e5137cef2bcb69",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873139",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c57d4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763a82c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873139",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v1.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v1.json
deleted file mode 100644
index fc98f94aa..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v1.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "codecopyNonConst_d1g0v1_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v1Filler.json",
-            "sourceHash" : "e83d300e5884afac0cff98f9704b31d6233eece338ac2667fea31e42159f5ad6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x57da",
-                    "hash" : "0xc4b34f70916ba7399132aa232581e8cba10419510a3e13dcd3a8aa47593a5454",
-                    "mixHash" : "0x85f197d6498ee6ceb69896dc390850c86c73b19da109a011785b8e5b9ef655e3",
-                    "nonce" : "0xa096b5c1b4e59ff4",
-                    "number" : "0x01",
-                    "parentHash" : "0xcfbb0091e5cf15042ee9a5cb54844f02f22d89d9d2c7675070cd5b6e64b179e3",
-                    "receiptTrie" : "0x9c650394245e9d7ccaf31bc5a039fac0a07d94611bbd574c5dfc507142335721",
-                    "stateRoot" : "0x0561cbbf9f6a6c0af92367947afe1cb7286a698cabe81e70d033432bd22790e2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a0cfbb0091e5cf15042ee9a5cb54844f02f22d89d9d2c7675070cd5b6e64b179e3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00561cbbf9f6a6c0af92367947afe1cb7286a698cabe81e70d033432bd22790e2a0b37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4a09c650394245e9d7ccaf31bc5a039fac0a07d94611bbd574c5dfc507142335721b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408257da8203e880a085f197d6498ee6ceb69896dc390850c86c73b19da109a011785b8e5b9ef655e388a096b5c1b4e59ff4f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d870184112233441ca02422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072a03bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcfbb0091e5cf15042ee9a5cb54844f02f22d89d9d2c7675070cd5b6e64b179e3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9b5eeb6214dd8c108a8cb7668888f29051fc86e258d56a93766ed39d79c3672f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b5eeb6214dd8c108a8cb7668888f29051fc86e258d56a93766ed39d79c3672fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4b34f70916ba7399132aa232581e8cba10419510a3e13dcd3a8aa47593a5454",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x01",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873139",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c57da",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763a825",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873139",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v0.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v0.json
deleted file mode 100644
index 8cba825dd..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v0.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "createNonConst_d1g0v0_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v0Filler.json",
-            "sourceHash" : "73709ef126394d8f7db9067ce7e1bd6b38bfd1f6f96e78735ad4c543efa3890a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0122f4",
-                    "hash" : "0xc235ea546039dd1d8fd216a1e1fd2f4f01bb1180de862345ffc65185b386e7b9",
-                    "mixHash" : "0x5bde1c0a434e755d5a6a7f50234023f81137ce8b49a41fe49191e74ce10fe600",
-                    "nonce" : "0xae193a7e4e7436b0",
-                    "number" : "0x01",
-                    "parentHash" : "0x516b81baa9b44bcae924213c71dfeac2ac31652d27a922ab37697773a98bd035",
-                    "receiptTrie" : "0x848a856b97c6be820f9f92e6029b5f2f9237b4f6b3f882761d5a6b29f1e9fccc",
-                    "stateRoot" : "0x24a238670286ae4418db046484f56bf433719631010ac736b589fdbffe0d3a6b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xf69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f8a0516b81baa9b44bcae924213c71dfeac2ac31652d27a922ab37697773a98bd035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024a238670286ae4418db046484f56bf433719631010ac736b589fdbffe0d3a6ba0f69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76a0848a856b97c6be820f9f92e6029b5f2f9237b4f6b3f882761d5a6b29f1e9fcccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830122f48203e880a05bde1c0a434e755d5a6a7f50234023f81137ce8b49a41fe49191e74ce10fe60088ae193a7e4e7436b0f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d878084112233441ba01aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962ba015c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x516b81baa9b44bcae924213c71dfeac2ac31652d27a922ab37697773a98bd035",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x49e89b907362b6df84aa90ef682503d52be9c97835b365cb14c49cb2e90cc71c",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049e89b907362b6df84aa90ef682503d52be9c97835b365cb14c49cb2e90cc71ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc235ea546039dd1d8fd216a1e1fd2f4f01bb1180de862345ffc65185b386e7b9",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f0600055",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62d22f4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762dd0c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v1.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v1.json
deleted file mode 100644
index 51c71370b..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v1.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "createNonConst_d1g0v1_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v1Filler.json",
-            "sourceHash" : "14ad80fae70aad439e89b996b2b2db572f2bcf2ff3703ff906d8bc141730290a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0122f7",
-                    "hash" : "0x6016edf4299f1048a63ae7047e46f8df222c26671d8012da0176e5bb1465eaae",
-                    "mixHash" : "0x6b8ca37b7b4172c8febc48a7f0ef3a51e81e1ad0a6bde394065fb331e9087ec7",
-                    "nonce" : "0xb156e60dddd6cf03",
-                    "number" : "0x01",
-                    "parentHash" : "0x516b81baa9b44bcae924213c71dfeac2ac31652d27a922ab37697773a98bd035",
-                    "receiptTrie" : "0x9c68551645418995f59aca5f52316016bdaf8c44dad2f98db37f92c76a303702",
-                    "stateRoot" : "0xf7feb437f046559c918caaec02bf3d4f565eab8dcb27fe2feee2d548dcb61216",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f8a0516b81baa9b44bcae924213c71dfeac2ac31652d27a922ab37697773a98bd035a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f7feb437f046559c918caaec02bf3d4f565eab8dcb27fe2feee2d548dcb61216a0b37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4a09c68551645418995f59aca5f52316016bdaf8c44dad2f98db37f92c76a303702b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830122f78203e880a06b8ca37b7b4172c8febc48a7f0ef3a51e81e1ad0a6bde394065fb331e9087ec788b156e60dddd6cf03f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d870184112233441ca02422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072a03bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x516b81baa9b44bcae924213c71dfeac2ac31652d27a922ab37697773a98bd035",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x49e89b907362b6df84aa90ef682503d52be9c97835b365cb14c49cb2e90cc71c",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049e89b907362b6df84aa90ef682503d52be9c97835b365cb14c49cb2e90cc71ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6016edf4299f1048a63ae7047e46f8df222c26671d8012da0176e5bb1465eaae",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f0600055",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62d22f7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762dd08",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v0.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v0.json
deleted file mode 100644
index 4551154d7..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v0.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-    "delegatecallNonConst_d1g0v0_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v0Filler.json",
-            "sourceHash" : "26bba784a77d8d54a4e7550d794b44e9f2b25877f1847fc1e1bf4e8b655c76fb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xad69",
-                    "hash" : "0x479d1ee86a1fa7b9891b2d442d729f18ffadff1c6cbed974af1babe22cf5fb27",
-                    "mixHash" : "0xbc033513362c18a04cb31b799a2fb9003efbe989d0765c23c5e46d5f6ef4d2bd",
-                    "nonce" : "0xc833cd1c555fd2e7",
-                    "number" : "0x01",
-                    "parentHash" : "0x99056bcb58eed55d3894f8de5539262cf40f6d38aa1d66a18d641565bdecf291",
-                    "receiptTrie" : "0x61add5d93abd7a8d3a84b76a840c178d31c73b24f360a250745cf05ac368f7f2",
-                    "stateRoot" : "0x5fca265fd21ac6cada46a55c5a5a8a9ab0a8febac95b1a8090720bee0f80a981",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xf69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a099056bcb58eed55d3894f8de5539262cf40f6d38aa1d66a18d641565bdecf291a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fca265fd21ac6cada46a55c5a5a8a9ab0a8febac95b1a8090720bee0f80a981a0f69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76a061add5d93abd7a8d3a84b76a840c178d31c73b24f360a250745cf05ac368f7f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082ad698203e880a0bc033513362c18a04cb31b799a2fb9003efbe989d0765c23c5e46d5f6ef4d2bd88c833cd1c555fd2e7f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d878084112233441ba01aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962ba015c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x99056bcb58eed55d3894f8de5539262cf40f6d38aa1d66a18d641565bdecf291",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x793d678a6d11930383040fdd95b392538baa698a52a235bc32be918710dca606",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0793d678a6d11930383040fdd95b392538baa698a52a235bc32be918710dca606a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x479d1ee86a1fa7b9891b2d442d729f18ffadff1c6cbed974af1babe22cf5fb27",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cad69",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635297",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v1.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v1.json
deleted file mode 100644
index bce686979..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v1.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "delegatecallNonConst_d1g0v1_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v1Filler.json",
-            "sourceHash" : "143f9871c6c3446f87f819a03bc94ac5cc85055c1459560986dedeb111c18a32"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x72d5",
-                    "hash" : "0x5cdbdfed477d0e735f21a7a297c062c649501ddf807d1f61eb5083a5c49b6227",
-                    "mixHash" : "0xff2feee31d5c1fd9d55616bbd6c1d2bff9e22bfb2dd541c891b65a9201806afa",
-                    "nonce" : "0x1e9104a1ef9965db",
-                    "number" : "0x01",
-                    "parentHash" : "0x99056bcb58eed55d3894f8de5539262cf40f6d38aa1d66a18d641565bdecf291",
-                    "receiptTrie" : "0xab575eb20fe1879e7d199c0221f09bcf94979dac7bf4ab24180acf34c2fd8b09",
-                    "stateRoot" : "0xbb9d04a5ae3c34957604855ad93268ab8bf8ea19dd175200ff3704410d2013a0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a099056bcb58eed55d3894f8de5539262cf40f6d38aa1d66a18d641565bdecf291a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb9d04a5ae3c34957604855ad93268ab8bf8ea19dd175200ff3704410d2013a0a0b37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4a0ab575eb20fe1879e7d199c0221f09bcf94979dac7bf4ab24180acf34c2fd8b09b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408272d58203e880a0ff2feee31d5c1fd9d55616bbd6c1d2bff9e22bfb2dd541c891b65a9201806afa881e9104a1ef9965dbf866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d870184112233441ca02422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072a03bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x99056bcb58eed55d3894f8de5539262cf40f6d38aa1d66a18d641565bdecf291",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x793d678a6d11930383040fdd95b392538baa698a52a235bc32be918710dca606",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0793d678a6d11930383040fdd95b392538baa698a52a235bc32be918710dca606a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cdbdfed477d0e735f21a7a297c062c649501ddf807d1f61eb5083a5c49b6227",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x01",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c72d5",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7638d2a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v0.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v0.json
deleted file mode 100644
index da39cd820..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v0.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "extcodecopyNonConst_d1g0v0_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v0Filler.json",
-            "sourceHash" : "2b4358b82cab57d9e70ec4a86913e42ab76ff008657130718ceb3bb61caddf3a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x5c20",
-                    "hash" : "0x7b39aeed392423196e2380ce4b3629135ab3955cffd675b1866ffb103f77eb18",
-                    "mixHash" : "0xf13637ceccc3fd416d2de96eab8a1e5de58b8838363e171eaea67012059cd1e9",
-                    "nonce" : "0xf8626220381eb9d3",
-                    "number" : "0x01",
-                    "parentHash" : "0xbdace82c42f01b5a95f23525403b44efcd4f8d3e7c7de0e5914b191e5bf301da",
-                    "receiptTrie" : "0xe88d0e09c51cc709e75de7f3d5f3fc5d83568c919b4ffd0d47771993d63b49f0",
-                    "stateRoot" : "0xf35217ee6461d4eb2fe66ab578b4be4480a33d0328b308ef085286ff363dcac5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xf69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a0bdace82c42f01b5a95f23525403b44efcd4f8d3e7c7de0e5914b191e5bf301daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f35217ee6461d4eb2fe66ab578b4be4480a33d0328b308ef085286ff363dcac5a0f69509fa492baef98db6a3853dd43b7848bd7e677c49ffebce54d59eaa4a3f76a0e88d0e09c51cc709e75de7f3d5f3fc5d83568c919b4ffd0d47771993d63b49f0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240825c208203e880a0f13637ceccc3fd416d2de96eab8a1e5de58b8838363e171eaea67012059cd1e988f8626220381eb9d3f866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d878084112233441ba01aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962ba015c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138ec0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xbdace82c42f01b5a95f23525403b44efcd4f8d3e7c7de0e5914b191e5bf301da",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x73b46daa5b63c00aadda0d6529d7d5d24435d1511c552d9826c4a02bbcb60c3a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b46daa5b63c00aadda0d6529d7d5d24435d1511c552d9826c4a02bbcb60c3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b39aeed392423196e2380ce4b3629135ab3955cffd675b1866ffb103f77eb18",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d87313c",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c5c20",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763a3e0",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d87313c",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v1.json b/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v1.json
deleted file mode 100644
index 4e1390b3f..000000000
--- a/BlockchainTests/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v1.json
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-    "extcodecopyNonConst_d1g0v1_Byzantium" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.ee0c6776.Linux.g++",
-            "lllcversion" : "Version: 0.4.20-develop.2018.2.4+commit.c696803f.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v1Filler.json",
-            "sourceHash" : "a9ee9e1237ef43d3937fbf1fa1a8b15361b4a123b2eeeccf3c18acdc12f11ed4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x5c26",
-                    "hash" : "0x7862cfb7c437debbc1876015e7fb47f4e416bbd6b3bd1623d98f4e4bec5adbe2",
-                    "mixHash" : "0x163b416b4856599d3b00921eb82f43f45851f2dd78d79a84c6bf7737b94ade0d",
-                    "nonce" : "0xa2cbbeabb7d5d68c",
-                    "number" : "0x01",
-                    "parentHash" : "0xbdace82c42f01b5a95f23525403b44efcd4f8d3e7c7de0e5914b191e5bf301da",
-                    "receiptTrie" : "0xf39acb17a71d129b9810c4b5b34a0ebd8eded16a49f06f854ec679efeaaca90f",
-                    "stateRoot" : "0x906270b50aa3493ae3194ae4621dacf7c1aa871dfaad63c0869d97ac437bca60",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f7a0bdace82c42f01b5a95f23525403b44efcd4f8d3e7c7de0e5914b191e5bf301daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0906270b50aa3493ae3194ae4621dacf7c1aa871dfaad63c0869d97ac437bca60a0b37e2d3b3cd6508ca45610bafb6a938ad335a7eb65ea8bca91f74f86badd06d4a0f39acb17a71d129b9810c4b5b34a0ebd8eded16a49f06f854ec679efeaaca90fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240825c268203e880a0163b416b4856599d3b00921eb82f43f45851f2dd78d79a84c6bf7737b94ade0d88a2cbbeabb7d5d68cf866f864800183061a8094095e7baea6a6c7c4c2dfeb977efac326af552d870184112233441ca02422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072a03bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83c0",
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xbdace82c42f01b5a95f23525403b44efcd4f8d3e7c7de0e5914b191e5bf301da",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x73b46daa5b63c00aadda0d6529d7d5d24435d1511c552d9826c4a02bbcb60c3a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073b46daa5b63c00aadda0d6529d7d5d24435d1511c552d9826c4a02bbcb60c3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7862cfb7c437debbc1876015e7fb47f4e416bbd6b3bd1623d98f4e4bec5adbe2",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x01",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d87313c",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62c5c26",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763a3d9",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d87313c",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/RevertInCreateInInit_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/RevertInCreateInInit_d0g0v0.json
deleted file mode 100644
index 59a797b18..000000000
--- a/BlockchainTests/GeneralStateTests/stCreate2/RevertInCreateInInit_d0g0v0.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "RevertInCreateInInit_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "RevertInCreateInInit for CREATE2",
-            "filledwith" : "testeth 1.5.0.dev2-45+commit.0189490f.dirty",
-            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/RevertInCreateInInit_d0g0v0Filler.json",
-            "sourceHash" : "68689814c158d5d3ccaf357166e4f238bcd76746c2f3fc242294f6b040274215"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0a00000000",
-                    "gasUsed" : "0x01f29b",
-                    "hash" : "0x69dd68c89c6f7d6b2748ea6ce5d1690998d65960a9cb4e0675c36658e4e3ef7b",
-                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-                    "nonce" : "0x0000000000000000",
-                    "number" : "0x01",
-                    "parentHash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145",
-                    "receiptTrie" : "0x3a2e63a6933d031e1ceba2448b067f90a79548ffa4c09bec28d33601e253910a",
-                    "stateRoot" : "0x7723babb814aedfcf84ee34bec3b0777f2a09ca78347de89157fd8e55d10b5c3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x7d26a98018717ccc4931543ee87014290b64d0cc95031e3b83f99a5db131677e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90280f901faa06a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07723babb814aedfcf84ee34bec3b0777f2a09ca78347de89157fd8e55d10b5c3a07d26a98018717ccc4931543ee87014290b64d0cc95031e3b83f99a5db131677ea03a2e63a6933d031e1ceba2448b067f90a79548ffa4c09bec28d33601e253910ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301f29b8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f880f87e8001850a000000008080b030506000600c80602460003960006000f5503d6000556020600060003e600051600155006211223360005260206000fd1ba078f220ad907e6fae34cdcaa3b0b1765e26c506d0ee724fac793fa124bcbdb053a004262c7e50ad6240f6b8cfe4ec3f273e71de0ff81996d453e1c79ca112ad5827c0",
-                "transactions" : [
-                    {
-                        "data" : "0x30506000600c80602460003960006000f5503d6000556020600060003e600051600155006211223360005260206000fd",
-                        "gasLimit" : "0x0a00000000",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x78f220ad907e6fae34cdcaa3b0b1765e26c506d0ee724fac793fa124bcbdb053",
-                        "s" : "0x04262c7e50ad6240f6b8cfe4ec3f273e71de0ff81996d453e1c79ca112ad5827",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0a00000000",
-            "gasUsed" : "0x00",
-            "hash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69dd68c89c6f7d6b2748ea6ce5d1690998d65960a9cb4e0675c36658e4e3ef7b",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x1bc16d674ec9f29b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x02",
-                "storage" : {
-                    "0x00" : "0x20",
-                    "0x01" : "0x112233"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x63fffe0d65",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x6400000000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "sealEngine" : "NoProof"
-    }
-}
-\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/RevertOpcodeInCreateReturns_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/RevertOpcodeInCreateReturns_d0g0v0.json
deleted file mode 100644
index fc5da310c..000000000
--- a/BlockchainTests/GeneralStateTests/stCreate2/RevertOpcodeInCreateReturns_d0g0v0.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "RevertOpcodeInCreateReturns_d0g0v0_Constantinople" : {
-        "_info" : {
-            "comment" : "RevertOpcodeInCreateReturns for CREATE2",
-            "filledwith" : "testeth 1.5.0.dev2-45+commit.0189490f.dirty",
-            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/RevertOpcodeInCreateReturns_d0g0v0Filler.json",
-            "sourceHash" : "fdd080bca33c928d512fb79cbd1c4efb2a6244cd20dbf6e00a27706aafd982d5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0a00000000",
-                    "gasUsed" : "0xe2c7",
-                    "hash" : "0x4d8ac764177a7fde868209a3df89402929c4127b19091149ddaa84de94215b2e",
-                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-                    "nonce" : "0x0000000000000000",
-                    "number" : "0x01",
-                    "parentHash" : "0xacb823cc5a133ba47164c591f383f95291774ca466521406680ece6f3a339f11",
-                    "receiptTrie" : "0x8d2ed8e44e9ffe14a6ab886a5dc0037c6131a33c47a32a48b0b0b3969e868325",
-                    "stateRoot" : "0x3ae238f3519fcf4f2f718e3e65828db778ddec4ab5875a2871d5999578893964",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xde317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616ab",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f9a0acb823cc5a133ba47164c591f383f95291774ca466521406680ece6f3a339f11a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ae238f3519fcf4f2f718e3e65828db778ddec4ab5875a2871d5999578893964a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba08d2ed8e44e9ffe14a6ab886a5dc0037c6131a33c47a32a48b0b0b3969e868325b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082e2c78203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0a00000000",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507",
-                        "s" : "0x24a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2",
-                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0a00000000",
-            "gasUsed" : "0x00",
-            "hash" : "0xacb823cc5a133ba47164c591f383f95291774ca466521406680ece6f3a339f11",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xcc9a8bea733b0f00442ff86f1f8aece3ec5f2f3c9bf4fbef2bef21e6333f2ed7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc9a8bea733b0f00442ff86f1f8aece3ec5f2f3c9bf4fbef2bef21e6333f2ed7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d8ac764177a7fde868209a3df89402929c4127b19091149ddaa84de94215b2e",
-        "network" : "Constantinople",
-        "postState" : {
-            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0x00",
-                "code" : "0x6000600c80601560003960006000f5503d600055006211223360005260206000fd",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0x20"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x1bc16d674ec8e2c7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x63ffff1d39",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0x00",
-                "code" : "0x6000600c80601560003960006000f5503d600055006211223360005260206000fd",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x6400000000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "sealEngine" : "NoProof"
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v0Filler.json
deleted file mode 100644
index ea59a3312..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v0Filler.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "callNonConst_d1g0v0" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v1Filler.json
deleted file mode 100644
index 6bfe169d5..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d1g0v1Filler.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "callNonConst_d1g0v1" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v0Filler.json
deleted file mode 100644
index f8aa37c5e..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v0Filler.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "callcodeNonConst_d1g0v0" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v1Filler.json
deleted file mode 100644
index 4edbfff9e..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d1g0v1Filler.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "callcodeNonConst_d1g0v1" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v0Filler.json
deleted file mode 100644
index 00477d27d..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v0Filler.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "codecopyNonConst_d1g0v0" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873139",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v1Filler.json
deleted file mode 100644
index 935a4fa07..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d1g0v1Filler.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "codecopyNonConst_d1g0v1" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873139",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v0Filler.json
deleted file mode 100644
index dadd2ca65..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v0Filler.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "createNonConst_d1g0v0" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v1Filler.json
deleted file mode 100644
index 47cebee53..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d1g0v1Filler.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "createNonConst_d1g0v1" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f0600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v0Filler.json
deleted file mode 100644
index a0c106062..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v0Filler.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "delegatecallNonConst_d1g0v0" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                            "0x00" : "0x01"
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v1Filler.json
deleted file mode 100644
index f84cfc8c0..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d1g0v1Filler.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "delegatecallNonConst_d1g0v1" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d8731f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v0Filler.json
deleted file mode 100644
index f494f9cda..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v0Filler.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "extcodecopyNonConst_d1g0v0" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x1aad07ef1ba69afe1deb9a1b05fc192087cd947a6e52e6c0f76fd5856bec962b",
-                        "s" : "0x15c58c343a0f31f3fae8adcba466e682e13aae308ef55ed032c038f43bd5138e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d87313c",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v1Filler.json
deleted file mode 100644
index 0cdc9aedb..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d1g0v1Filler.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "extcodecopyNonConst_d1g0v1" : {
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0f4240",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x11223344",
-                        "gasLimit" : "0x061a80",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x2422b07e8847176feb8a340a13e78020672ab45efce024e88a67f7f6dc33e072",
-                        "s" : "0x3bd6050e469f4c362870f670707295efbe37ad3b1854a62da8010598d5710e83",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x01"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Byzantium",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            },
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "storage" : {
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x00",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d873173095e7baea6a6c7c4c2dfeb977efac326af552d87313c",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/RevertInCreateInInit_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/RevertInCreateInInit_d0g0v0Filler.json
deleted file mode 100644
index 34e136e53..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/RevertInCreateInInit_d0g0v0Filler.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "RevertInCreateInInit_d0g0v0" : {
-        "_info" : {
-            "comment" : "RevertInCreateInInit for CREATE2"
-        },
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0a00000000",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x30506000600c80602460003960006000f5503d6000556020600060003e600051600155006211223360005260206000fd",
-                        "gasLimit" : "0x0a00000000",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x78f220ad907e6fae34cdcaa3b0b1765e26c506d0ee724fac793fa124bcbdb053",
-                        "s" : "0x04262c7e50ad6240f6b8cfe4ec3f273e71de0ff81996d453e1c79ca112ad5827",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                        "storage" : {
-                            "0x00" : "0x20",
-                            "0x01" : "0x112233"
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0a00000000",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x6400000000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "sealEngine" : "NoProof"
-    }
-}
-\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/RevertOpcodeInCreateReturns_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/RevertOpcodeInCreateReturns_d0g0v0Filler.json
deleted file mode 100644
index d606fbe8c..000000000
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/RevertOpcodeInCreateReturns_d0g0v0Filler.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "RevertOpcodeInCreateReturns_d0g0v0" : {
-        "_info" : {
-            "comment" : "RevertOpcodeInCreateReturns for CREATE2"
-        },
-        "blocks" : [
-            {
-                "blockHeaderPremine" : {
-                    "difficulty" : "0x020000",
-                    "gasLimit" : "0x0a00000000",
-                    "timestamp" : "0x03e8",
-                    "updatePoW" : "1"
-                },
-                "transactions" : [
-                    {
-                        "data" : "0x",
-                        "gasLimit" : "0x0a00000000",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507",
-                        "s" : "0x24a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2",
-                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "expect" : [
-            {
-                "network" : "Constantinople",
-                "result" : {
-                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                        "storage" : {
-                            "0x00" : "0x20"
-                        }
-                    }
-                }
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "131072",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0a00000000",
-            "gasUsed" : "0",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "pre" : {
-            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0x00",
-                "code" : "0x6000600c80601560003960006000f5503d600055006211223360005260206000fd",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x6400000000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "sealEngine" : "NoProof"
-    }
-}
-\ No newline at end of file