Merge pull request #497 from ethereum/create2

refill collision test

58 files changed, 7547 insertions, 223 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json
index b54e7d49e..b05ccd72f 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionBalance_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json",
-            "sourceHash" : "a6dbbb19e1e4568d0b846c3ccc6f470e1a4a9378672b9f79b0238e97da147a1d"
+            "sourceHash" : "2654c43bd4351356a9eaafcf540359a0c608d7b9fcbf0214da46331b0e80bab9"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3c21af30970cb3040c54f5beda9656e343aa46cfe508e90c8f1cd910d4863a20",
+                    "hash" : "0xabbc2e834d4d06ea7a81290bd27db522598aabfe0a85a57e2d7dec0fc14624e3",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x9341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0x72f450246420cee8e36eec7ba251702e7e5bd837853571cff0fc4b31e165def2",
+                    "stateRoot" : "0x6367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a09341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa072f450246420cee8e36eec7ba251702e7e5bd837853571cff0fc4b31e165def2a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x9341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4087d8a0d34a21f4873ae2650e1a87fa8d6761d84ccaeac32c1375f3ed1a0e5d",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04087d8a0d34a21f4873ae2650e1a87fa8d6761d84ccaeac32c1375f3ed1a0e5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c21af30970cb3040c54f5beda9656e343aa46cfe508e90c8f1cd910d4863a20",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xabbc2e834d4d06ea7a81290bd27db522598aabfe0a85a57e2d7dec0fc14624e3",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,12 +81,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -97,23 +111,37 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionBalance_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json",
-            "sourceHash" : "a6dbbb19e1e4568d0b846c3ccc6f470e1a4a9378672b9f79b0238e97da147a1d"
+            "sourceHash" : "2654c43bd4351356a9eaafcf540359a0c608d7b9fcbf0214da46331b0e80bab9"
         },
         "blocks" : [
             {
@@ -124,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x014d78",
-                    "hash" : "0x0631c550bf033c0cade9d1ac8062a2dd047cab21428675be89f5c18647188e05",
+                    "hash" : "0x4d41a66fcddf207bfbd75e2fbff9a908222fe26e6c213754acb69250f4139281",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x9341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
                     "receiptTrie" : "0x0280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345",
-                    "stateRoot" : "0x2f10f9405b122dc144875e68134253b4f5eac633b742d1b20585891bf953bc70",
+                    "stateRoot" : "0xfee04fc073a8baf8561bfeddcc2b9bf15bdf26c361b20e79a4ee37ee29948e67",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a09341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f10f9405b122dc144875e68134253b4f5eac633b742d1b20585891bf953bc70a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a00280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014d788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fee04fc073a8baf8561bfeddcc2b9bf15bdf26c361b20e79a4ee37ee29948e67a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a00280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014d788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -160,19 +188,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x9341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4087d8a0d34a21f4873ae2650e1a87fa8d6761d84ccaeac32c1375f3ed1a0e5d",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04087d8a0d34a21f4873ae2650e1a87fa8d6761d84ccaeac32c1375f3ed1a0e5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0631c550bf033c0cade9d1ac8062a2dd047cab21428675be89f5c18647188e05",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4d41a66fcddf207bfbd75e2fbff9a908222fe26e6c213754acb69250f4139281",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -196,12 +224,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -212,12 +254,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0.json
new file mode 100644
index 000000000..0efbd70b8
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0.json
@@ -0,0 +1,282 @@
+{
+    "create2collisionBalance_d1g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json",
+            "sourceHash" : "de3c3a4919dd9f5c2afaae321b579e0a67b109025c0c2173af5a67bfd84328d4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0xcf8655a50363f46934115e88571b5a4a1af6c54ccb52bf41af81cc67747e79f2",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x6367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32a0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcf8655a50363f46934115e88571b5a4a1af6c54ccb52bf41af81cc67747e79f2",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionBalance_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json",
+            "sourceHash" : "de3c3a4919dd9f5c2afaae321b579e0a67b109025c0c2173af5a67bfd84328d4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x019e4e",
+                    "hash" : "0x9193317880cb834a3de993b9fe356e8b7a7248c0d451b1e989c026d5d949100d",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+                    "receiptTrie" : "0x908fdf67d77ea4340d0d868e513eb0b5c689dfc14418e6beffd11356b6fbc802",
+                    "stateRoot" : "0x6dda3b07a9b201a63c95ca6ac4aec82e212b234d541fbd2c857a8635d2166ac3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06dda3b07a9b201a63c95ca6ac4aec82e212b234d541fbd2c857a8635d2166ac3a0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0908fdf67d77ea4340d0d868e513eb0b5c689dfc14418e6beffd11356b6fbc802b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019e4e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9193317880cb834a3de993b9fe356e8b7a7248c0d451b1e989c026d5d949100d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d9e4e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76261b1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0.json
new file mode 100644
index 000000000..2a74966aa
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0.json
@@ -0,0 +1,281 @@
+{
+    "create2collisionBalance_d2g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json",
+            "sourceHash" : "087990e3409d8da018f3d8751da603e583a794221e61de770f624936338b26a1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0x93f070fc99dde0ce6e337210e6e4f8ed739718b8395aead756d87ac34e4948bf",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x6367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32a06144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f869f867800183061a8080019b6d6460016001556000526005601bf36000526000600e60126000f51ba06e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935a0672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x93f070fc99dde0ce6e337210e6e4f8ed739718b8395aead756d87ac34e4948bf",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionBalance_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json",
+            "sourceHash" : "087990e3409d8da018f3d8751da603e583a794221e61de770f624936338b26a1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x015646",
+                    "hash" : "0x8c7f4c1988d48267f110c6298c4a8ce4fe2924bd3a5a9b77d078b6912a685967",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+                    "receiptTrie" : "0xbf08a27ebea5aee35a1889502d1d9cd784e7c503ac3c2d9f6275286fb518f574",
+                    "stateRoot" : "0x50ed76edff66825f603da4c377a685ad0cb880b03e7837c75d09d1c85be10b19",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050ed76edff66825f603da4c377a685ad0cb880b03e7837c75d09d1c85be10b19a06144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131a0bf08a27ebea5aee35a1889502d1d9cd784e7c503ac3c2d9f6275286fb518f574b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830156468203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f869f867800183061a8080019b6d6460016001556000526005601bf36000526000600e60126000f51ba06e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935a0672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8c7f4c1988d48267f110c6298c4a8ce4fe2924bd3a5a9b77d078b6912a685967",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d5646",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a9b9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0.json
new file mode 100644
index 000000000..9ffd6d39c
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0.json
@@ -0,0 +1,281 @@
+{
+    "create2collisionBalance_d3g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json",
+            "sourceHash" : "d56ffb5123f5ca4dd426cfa0442c0fd86249e4b2b31682d471d7df57af3e7175"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0x060c44be8853bc442e534f6008dbdb1c514623493934c4089620ee17b994704f",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x6367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3e9225e018bf6a8048d1788dbe869d9c9ad5ebbb2cbef17f340ae7945c53f0e8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90255f901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32a03e9225e018bf6a8048d1788dbe869d9c9ad5ebbb2cbef17f340ae7945c53f0e8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006001f51ca0bcb8e3b988ef2600800744cbd56a589545f6835ba785bd1294cbfd4269475e5fa0364cd8be570ac583145288da8593dce1f18b3886f33ef75133779d02babaec14c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006001f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbcb8e3b988ef2600800744cbd56a589545f6835ba785bd1294cbfd4269475e5f",
+                        "s" : "0x364cd8be570ac583145288da8593dce1f18b3886f33ef75133779d02babaec14",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x060c44be8853bc442e534f6008dbdb1c514623493934c4089620ee17b994704f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionBalance_d3g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json",
+            "sourceHash" : "d56ffb5123f5ca4dd426cfa0442c0fd86249e4b2b31682d471d7df57af3e7175"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x014db8",
+                    "hash" : "0xfff78a4f9c73ee4efd82771ed60cb76fa84ba832363059f8dbe5d626c2d0776f",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+                    "receiptTrie" : "0xe16440e98dee2ca4d8a984ab2cd4813dd80e2897037016cd4ceffa32f34168f2",
+                    "stateRoot" : "0x7fdb0b940cc9a6db8dd66f71de3d1b5572b8e2b9ca251fe0e33233f3bfe90582",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3e9225e018bf6a8048d1788dbe869d9c9ad5ebbb2cbef17f340ae7945c53f0e8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90255f901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07fdb0b940cc9a6db8dd66f71de3d1b5572b8e2b9ca251fe0e33233f3bfe90582a03e9225e018bf6a8048d1788dbe869d9c9ad5ebbb2cbef17f340ae7945c53f0e8a0e16440e98dee2ca4d8a984ab2cd4813dd80e2897037016cd4ceffa32f34168f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014db88203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006001f51ca0bcb8e3b988ef2600800744cbd56a589545f6835ba785bd1294cbfd4269475e5fa0364cd8be570ac583145288da8593dce1f18b3886f33ef75133779d02babaec14c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006001f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbcb8e3b988ef2600800744cbd56a589545f6835ba785bd1294cbfd4269475e5f",
+                        "s" : "0x364cd8be570ac583145288da8593dce1f18b3886f33ef75133779d02babaec14",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfff78a4f9c73ee4efd82771ed60cb76fa84ba832363059f8dbe5d626c2d0776f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d4db8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762b247",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x02",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0.json
index 23b109205..5c6b6e16a 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionCode_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has not empty code",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json",
-            "sourceHash" : "b15322cf4345d4628c56abd674d6b66af98b63d4ba8c2c683e57ec86fde64785"
+            "sourceHash" : "93a7d25e92b673eadaa93f7e0f3cc2f040591163928788c13abe4941f4ca0133"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4389c7cca02c082d28b47c7689223c2a37387a25a77024e2e8afaff4a7091e5b",
+                    "hash" : "0xd0ff73c34c305c5922ce796d46b5814839603ffeef39707ff38a685743e486b6",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0xc32cf6755bfbf7634fae65bd61382dd070bfa81a017658022a281716733b03f7",
+                    "parentHash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0x7b2e70bf4d2856e982f472a7d999fec9ed97519e6e4517df905d1d5f8e6cb6d1",
+                    "stateRoot" : "0x23ce4e374aa8adc71aafe7e928e96501ea3a3088d95db6143026d6a45813cf38",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a0c32cf6755bfbf7634fae65bd61382dd070bfa81a017658022a281716733b03f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b2e70bf4d2856e982f472a7d999fec9ed97519e6e4517df905d1d5f8e6cb6d1a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a077bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa023ce4e374aa8adc71aafe7e928e96501ea3a3088d95db6143026d6a45813cf38a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xc32cf6755bfbf7634fae65bd61382dd070bfa81a017658022a281716733b03f7",
+            "hash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x852d63d8e83bc56efc614c211b3d3f38f6ad1e848f8af323a6488a2c6a4fb4d4",
+            "stateRoot" : "0x3f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5f",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0852d63d8e83bc56efc614c211b3d3f38f6ad1e848f8af323a6488a2c6a4fb4d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4389c7cca02c082d28b47c7689223c2a37387a25a77024e2e8afaff4a7091e5b",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd0ff73c34c305c5922ce796d46b5814839603ffeef39707ff38a685743e486b6",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,12 +81,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "0x010203",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -97,23 +111,37 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "0x010203",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionCode_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has not empty code",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json",
-            "sourceHash" : "b15322cf4345d4628c56abd674d6b66af98b63d4ba8c2c683e57ec86fde64785"
+            "sourceHash" : "93a7d25e92b673eadaa93f7e0f3cc2f040591163928788c13abe4941f4ca0133"
         },
         "blocks" : [
             {
@@ -124,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06074c",
-                    "hash" : "0xce50db66cdf84bba20863ef680950f6dce3b6e0f6e60b433083b8c0e4249d431",
+                    "hash" : "0xaf7be1b12d86087ee80daee134747ea2a44d49cbbdd7e0cc2c65d6f433ae7feb",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0xc32cf6755bfbf7634fae65bd61382dd070bfa81a017658022a281716733b03f7",
+                    "parentHash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
                     "receiptTrie" : "0xf290f8c8f35117495b4b9f7d65c1d35ccf6d6de23e1b603ae0fd7135ba0ccaf0",
-                    "stateRoot" : "0xe2a4bae47aa6c4bade616fe55b2aefd49f8a90ebd1d261520910e076cb888b1a",
+                    "stateRoot" : "0x3232c2ad434a15c7d54e9b4bd565f7b72af66d1eaf19981e99f770221fd82144",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a0c32cf6755bfbf7634fae65bd61382dd070bfa81a017658022a281716733b03f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2a4bae47aa6c4bade616fe55b2aefd49f8a90ebd1d261520910e076cb888b1aa0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0f290f8c8f35117495b4b9f7d65c1d35ccf6d6de23e1b603ae0fd7135ba0ccaf0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306074c8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a077bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03232c2ad434a15c7d54e9b4bd565f7b72af66d1eaf19981e99f770221fd82144a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0f290f8c8f35117495b4b9f7d65c1d35ccf6d6de23e1b603ae0fd7135ba0ccaf0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306074c8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -160,19 +188,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xc32cf6755bfbf7634fae65bd61382dd070bfa81a017658022a281716733b03f7",
+            "hash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x852d63d8e83bc56efc614c211b3d3f38f6ad1e848f8af323a6488a2c6a4fb4d4",
+            "stateRoot" : "0x3f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5f",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0852d63d8e83bc56efc614c211b3d3f38f6ad1e848f8af323a6488a2c6a4fb4d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce50db66cdf84bba20863ef680950f6dce3b6e0f6e60b433083b8c0e4249d431",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaf7be1b12d86087ee80daee134747ea2a44d49cbbdd7e0cc2c65d6f433ae7feb",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -196,12 +224,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "0x010203",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -212,12 +254,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "0x010203",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0.json
new file mode 100644
index 000000000..0b6f76c7c
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0.json
@@ -0,0 +1,281 @@
+{
+    "create2collisionCode_d1g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has not empty code",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json",
+            "sourceHash" : "30509fbac034175b89c677a9fac9c03e79faef4edfb1fdddc5e87157faf7c533"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0x3e703c08bc411823f45946017b9f9da97e1c6ec2be5aa6b67b52cd0418a93532",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x23ce4e374aa8adc71aafe7e928e96501ea3a3088d95db6143026d6a45813cf38",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f8a077bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa023ce4e374aa8adc71aafe7e928e96501ea3a3088d95db6143026d6a45813cf38a0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3e703c08bc411823f45946017b9f9da97e1c6ec2be5aa6b67b52cd0418a93532",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionCode_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has not empty code",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json",
+            "sourceHash" : "30509fbac034175b89c677a9fac9c03e79faef4edfb1fdddc5e87157faf7c533"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x060757",
+                    "hash" : "0x7603acbc8166a2e84a0d50c78b6801533f1ff7e95f8fef3c7f95cb3424449fac",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
+                    "receiptTrie" : "0xd273f6ce49bdae7b8b607f3257b8368175d90e7cd3461eee3098eb7ad340fe31",
+                    "stateRoot" : "0x0f008e7c7bcf9f0c2bac16a75a4fde27f5adbbb0f76998f31a49bae344b01e85",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f8a077bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f008e7c7bcf9f0c2bac16a75a4fde27f5adbbb0f76998f31a49bae344b01e85a0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0d273f6ce49bdae7b8b607f3257b8368175d90e7cd3461eee3098eb7ad340fe31b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830607578203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7603acbc8166a2e84a0d50c78b6801533f1ff7e95f8fef3c7f95cb3424449fac",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6320757",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75df8a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0.json
new file mode 100644
index 000000000..e7ee29eb7
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0.json
@@ -0,0 +1,281 @@
+{
+    "create2collisionCode_d2g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has not empty code",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json",
+            "sourceHash" : "6d14428177f72c8ec6e51874ae09e6d5b752cac61a5eddf3fa7295d9e572eba4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0xbf6aa9ed1e250df98232268d483d0b88bc4cc3c591f7ba418a16f842dfefa1f9",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x23ce4e374aa8adc71aafe7e928e96501ea3a3088d95db6143026d6a45813cf38",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901f8a077bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa023ce4e374aa8adc71aafe7e928e96501ea3a3088d95db6143026d6a45813cf38a06144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f869f867800183061a8080019b6d6460016001556000526005601bf36000526000600e60126000f51ba06e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935a0672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbf6aa9ed1e250df98232268d483d0b88bc4cc3c591f7ba418a16f842dfefa1f9",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionCode_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has not empty code",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json",
+            "sourceHash" : "6d14428177f72c8ec6e51874ae09e6d5b752cac61a5eddf3fa7295d9e572eba4"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x060760",
+                    "hash" : "0x8f674e98fde9a1b2b4764ecc5f4172b14ba56d24e9f76ae6d2b93738b446a1dc",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
+                    "receiptTrie" : "0xcea7cca410c9c5710b859117408d257ab5794cd7ac4c03c013913fdda027bbfd",
+                    "stateRoot" : "0x8b2831eee2f24f309ff5bc8e7eb5b5295fb11f335fd817eca0c33e7035db19f7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901f8a077bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b2831eee2f24f309ff5bc8e7eb5b5295fb11f335fd817eca0c33e7035db19f7a06144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131a0cea7cca410c9c5710b859117408d257ab5794cd7ac4c03c013913fdda027bbfdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830607608203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f869f867800183061a8080019b6d6460016001556000526005601bf36000526000600e60126000f51ba06e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935a0672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x77bec9c28effbee35be324158202b6aac4a5815b10e6e980ecad49c6571ce51b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f7a939d4edc4e245295c18b442c80655fd0146f70bf2f73e13a6a2a8eff8a5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8f674e98fde9a1b2b4764ecc5f4172b14ba56d24e9f76ae6d2b93738b446a1dc",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6320760",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75df89f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0.json
index 07c153c5c..86977bda7 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionNonce_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has nonce != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json",
-            "sourceHash" : "fadb0b0d234182abcff906d24aea45419c6697ce8ca1623ee4e48f26efc749c3"
+            "sourceHash" : "a29ed23f6417ba605ccf4f617640704da8bf5e72d6717975394eb0fcac3ab49f"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc625220a53e7f7db5453a9af996e6a4d8d4bf053cb114931ec05a8ec8bb1421f",
+                    "hash" : "0xfc72d8430ff751c232aa752ee28e842bb9e80075e2f44fae8cc580d90e279d15",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x7c2ea96def6db90645a5cfd80a18ed453ea7286186a06eeaadbf443787789354",
+                    "parentHash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xce24f5cc47a35b19e650633f59f6c9fd05d25e026e327bb10a206068a6c68dcc",
+                    "stateRoot" : "0x62340939c94e960735cfdfd9d83bc242c492f427376bc91898d54e8219695e09",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a07c2ea96def6db90645a5cfd80a18ed453ea7286186a06eeaadbf443787789354a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce24f5cc47a35b19e650633f59f6c9fd05d25e026e327bb10a206068a6c68dcca0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a0eafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062340939c94e960735cfdfd9d83bc242c492f427376bc91898d54e8219695e09a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x7c2ea96def6db90645a5cfd80a18ed453ea7286186a06eeaadbf443787789354",
+            "hash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5da2de896efa367bea2b2394bda7baaef090c50ef3021488b9135d5fb4dd21db",
+            "stateRoot" : "0x3a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05da2de896efa367bea2b2394bda7baaef090c50ef3021488b9135d5fb4dd21dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc625220a53e7f7db5453a9af996e6a4d8d4bf053cb114931ec05a8ec8bb1421f",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfc72d8430ff751c232aa752ee28e842bb9e80075e2f44fae8cc580d90e279d15",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,12 +81,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -97,23 +111,37 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionNonce_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has nonce != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json",
-            "sourceHash" : "fadb0b0d234182abcff906d24aea45419c6697ce8ca1623ee4e48f26efc749c3"
+            "sourceHash" : "a29ed23f6417ba605ccf4f617640704da8bf5e72d6717975394eb0fcac3ab49f"
         },
         "blocks" : [
             {
@@ -124,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06074c",
-                    "hash" : "0x5f2d741a4b4a3d3a2ae3def0c5364403bbc922acde1c845d0a964540f1e6764a",
+                    "hash" : "0x42e04300721bfb9745ea8cb0984fcfb592bbfa76581ba858538eab4222662f2f",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x7c2ea96def6db90645a5cfd80a18ed453ea7286186a06eeaadbf443787789354",
+                    "parentHash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
                     "receiptTrie" : "0xf290f8c8f35117495b4b9f7d65c1d35ccf6d6de23e1b603ae0fd7135ba0ccaf0",
-                    "stateRoot" : "0x006d6b8c1a0c3dfe73e61f740d3d84e4feeacf7bb4ce0eaa590bbc9f7ebd60b0",
+                    "stateRoot" : "0x13e8aa68910f16d43e4f8973c5315c0c8ae87d07e07025b1c03bb0fc2c745617",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a07c2ea96def6db90645a5cfd80a18ed453ea7286186a06eeaadbf443787789354a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0006d6b8c1a0c3dfe73e61f740d3d84e4feeacf7bb4ce0eaa590bbc9f7ebd60b0a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0f290f8c8f35117495b4b9f7d65c1d35ccf6d6de23e1b603ae0fd7135ba0ccaf0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306074c8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a0eafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa013e8aa68910f16d43e4f8973c5315c0c8ae87d07e07025b1c03bb0fc2c745617a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0f290f8c8f35117495b4b9f7d65c1d35ccf6d6de23e1b603ae0fd7135ba0ccaf0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306074c8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -160,19 +188,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x7c2ea96def6db90645a5cfd80a18ed453ea7286186a06eeaadbf443787789354",
+            "hash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5da2de896efa367bea2b2394bda7baaef090c50ef3021488b9135d5fb4dd21db",
+            "stateRoot" : "0x3a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05da2de896efa367bea2b2394bda7baaef090c50ef3021488b9135d5fb4dd21dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f2d741a4b4a3d3a2ae3def0c5364403bbc922acde1c845d0a964540f1e6764a",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x42e04300721bfb9745ea8cb0984fcfb592bbfa76581ba858538eab4222662f2f",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -196,12 +224,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -212,12 +254,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0.json
new file mode 100644
index 000000000..87c78cc5c
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0.json
@@ -0,0 +1,281 @@
+{
+    "create2collisionNonce_d1g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has nonce != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json",
+            "sourceHash" : "b9877a729c88753ba37df951da3d9752fb61b3d38fdf703dac9758604ffad12c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0xbcea1f543b90fc0e26122319d9cdd37803f3a0b37092145c436e0993816cef7e",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x62340939c94e960735cfdfd9d83bc242c492f427376bc91898d54e8219695e09",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f8a0eafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062340939c94e960735cfdfd9d83bc242c492f427376bc91898d54e8219695e09a0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbcea1f543b90fc0e26122319d9cdd37803f3a0b37092145c436e0993816cef7e",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionNonce_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has nonce != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json",
+            "sourceHash" : "b9877a729c88753ba37df951da3d9752fb61b3d38fdf703dac9758604ffad12c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x060757",
+                    "hash" : "0x4c95a4fabc39836a0aada8eb957cb6893a044ad71c8b0f8aac9f927c1c561b01",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
+                    "receiptTrie" : "0xd273f6ce49bdae7b8b607f3257b8368175d90e7cd3461eee3098eb7ad340fe31",
+                    "stateRoot" : "0x5615c8b3dc86cc7b0e0c0ac87a05515541b3f069a9971107f2c924d848a4b06f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f8a0eafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05615c8b3dc86cc7b0e0c0ac87a05515541b3f069a9971107f2c924d848a4b06fa0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0d273f6ce49bdae7b8b607f3257b8368175d90e7cd3461eee3098eb7ad340fe31b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830607578203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4c95a4fabc39836a0aada8eb957cb6893a044ad71c8b0f8aac9f927c1c561b01",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6320757",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75df8a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0.json
new file mode 100644
index 000000000..25b19a203
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0.json
@@ -0,0 +1,281 @@
+{
+    "create2collisionNonce_d2g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has nonce != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json",
+            "sourceHash" : "996ca17406ca595e49973fd421c5be4a65a6727cd1267228973ed5e23c3903d3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0xb9181588c0267f36934c8b7bb56998cb5fcc4f5fa818e005c98a39d3349b4696",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x62340939c94e960735cfdfd9d83bc242c492f427376bc91898d54e8219695e09",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901f8a0eafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062340939c94e960735cfdfd9d83bc242c492f427376bc91898d54e8219695e09a06144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f869f867800183061a8080019b6d6460016001556000526005601bf36000526000600e60126000f51ba06e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935a0672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb9181588c0267f36934c8b7bb56998cb5fcc4f5fa818e005c98a39d3349b4696",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionNonce_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has nonce != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json",
+            "sourceHash" : "996ca17406ca595e49973fd421c5be4a65a6727cd1267228973ed5e23c3903d3"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x060760",
+                    "hash" : "0xe950c3db9920351ae673a2aacbcf4d674cb5421dea335a4d4128216fb5ca8ddb",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
+                    "receiptTrie" : "0xcea7cca410c9c5710b859117408d257ab5794cd7ac4c03c013913fdda027bbfd",
+                    "stateRoot" : "0x7ea73569ad8620d64267ce5252e905dbaf37638d035a0e974cc496b4dbbfb3e5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901f8a0eafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea73569ad8620d64267ce5252e905dbaf37638d035a0e974cc496b4dbbfb3e5a06144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131a0cea7cca410c9c5710b859117408d257ab5794cd7ac4c03c013913fdda027bbfdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830607608203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f869f867800183061a8080019b6d6460016001556000526005601bf36000526000600e60126000f51ba06e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935a0672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xeafb47e175a086d8e48fcb99bfdf7e603dfa18fc797530004e427f830477738b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3a6d1c1e13abac386247d44eb18ae02f7012c769bac02a33ecbb2f1ae4c608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe950c3db9920351ae673a2aacbcf4d674cb5421dea335a4d4128216fb5ca8ddb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6320760",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75df89f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json
index 0d6146582..271d87d21 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionSelfdestructedOOG_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086f4c264b6bba7858a07d31bf7871aa7fb33cb00b9882ca33238909242ad8e"
+            "sourceHash" : "34523f6c79c063d5963718093beea76aea0e7f14a2dc221a21074b90ebd1c5d9"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x030d40",
-                    "hash" : "0x73cb949853684df61a322ac8670e58b1c276d6e258a08aa5c1a30b86b15b6223",
+                    "hash" : "0x2fbaee6ba96ad35e991b8dd5e943674bb2e024e1c266328ef241acba75d75243",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
-                    "stateRoot" : "0x50a3173679e84912c431f8076b98e651e3a3d006913d4f82c18f188e94ac8391",
+                    "stateRoot" : "0x949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050a3173679e84912c431f8076b98e651e3a3d006913d4f82c18f188e94ac8391a05bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f883f881800183030d408001b56000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000551ca05f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64aa04a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03c0",
+                "rlp" : "0xf90281f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75fa05bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f883f881800183030d408001b56000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000551ca05f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64aa04a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73cb949853684df61a322ac8670e58b1c276d6e258a08aa5c1a30b86b15b6223",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2fbaee6ba96ad35e991b8dd5e943674bb2e024e1c266328ef241acba75d75243",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,12 +81,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -97,23 +111,37 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionSelfdestructedOOG_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086f4c264b6bba7858a07d31bf7871aa7fb33cb00b9882ca33238909242ad8e"
+            "sourceHash" : "34523f6c79c063d5963718093beea76aea0e7f14a2dc221a21074b90ebd1c5d9"
         },
         "blocks" : [
             {
@@ -124,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x030d40",
-                    "hash" : "0x73cb949853684df61a322ac8670e58b1c276d6e258a08aa5c1a30b86b15b6223",
+                    "hash" : "0x2fbaee6ba96ad35e991b8dd5e943674bb2e024e1c266328ef241acba75d75243",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
-                    "stateRoot" : "0x50a3173679e84912c431f8076b98e651e3a3d006913d4f82c18f188e94ac8391",
+                    "stateRoot" : "0x949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050a3173679e84912c431f8076b98e651e3a3d006913d4f82c18f188e94ac8391a05bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f883f881800183030d408001b56000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000551ca05f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64aa04a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03c0",
+                "rlp" : "0xf90281f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75fa05bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f883f881800183030d408001b56000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000551ca05f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64aa04a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055",
@@ -160,19 +188,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73cb949853684df61a322ac8670e58b1c276d6e258a08aa5c1a30b86b15b6223",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2fbaee6ba96ad35e991b8dd5e943674bb2e024e1c266328ef241acba75d75243",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -189,12 +217,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -205,12 +247,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0.json
new file mode 100644
index 000000000..6524c01e6
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0.json
@@ -0,0 +1,274 @@
+{
+    "create2collisionSelfdestructedOOG_d1g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json",
+            "sourceHash" : "79ff674f5b1ec3c65030c552de352fe61b0a8062d974f53f2fec5dad1f83e8f1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xe63c1e0e472f6fc9fa363e6fca745145f0140e506fb251e3a9d57df1b7f7a9d5",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8792ded442d9d1be895fe6b5d2745ca9b5d4b194933b9117108789cc1e12fc1f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9028bf901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75fa08792ded442d9d1be895fe6b5d2745ca9b5d4b194933b9117108789cc1e12fc1fa0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f88df88b800183030d408001b83e6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f550621122336000551ca0c0f0aee182bd978f7c158b0cd8d4e302186af634691f09f2f6ded35435b3a67ca02f6dc01df80d1f8d4281bb3db9090054b64085ae9756ed75e4165167d654c2c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f55062112233600055",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0f0aee182bd978f7c158b0cd8d4e302186af634691f09f2f6ded35435b3a67c",
+                        "s" : "0x2f6dc01df80d1f8d4281bb3db9090054b64085ae9756ed75e4165167d654c2c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe63c1e0e472f6fc9fa363e6fca745145f0140e506fb251e3a9d57df1b7f7a9d5",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62f0d40",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a760f2c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionSelfdestructedOOG_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json",
+            "sourceHash" : "79ff674f5b1ec3c65030c552de352fe61b0a8062d974f53f2fec5dad1f83e8f1"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0xe63c1e0e472f6fc9fa363e6fca745145f0140e506fb251e3a9d57df1b7f7a9d5",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8792ded442d9d1be895fe6b5d2745ca9b5d4b194933b9117108789cc1e12fc1f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9028bf901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75fa08792ded442d9d1be895fe6b5d2745ca9b5d4b194933b9117108789cc1e12fc1fa0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f88df88b800183030d408001b83e6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f550621122336000551ca0c0f0aee182bd978f7c158b0cd8d4e302186af634691f09f2f6ded35435b3a67ca02f6dc01df80d1f8d4281bb3db9090054b64085ae9756ed75e4165167d654c2c5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f55062112233600055",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0f0aee182bd978f7c158b0cd8d4e302186af634691f09f2f6ded35435b3a67c",
+                        "s" : "0x2f6dc01df80d1f8d4281bb3db9090054b64085ae9756ed75e4165167d654c2c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe63c1e0e472f6fc9fa363e6fca745145f0140e506fb251e3a9d57df1b7f7a9d5",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62f0d40",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a760f2c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0.json
new file mode 100644
index 000000000..260fdf9ed
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0.json
@@ -0,0 +1,274 @@
+{
+    "create2collisionSelfdestructedOOG_d2g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json",
+            "sourceHash" : "7c0901ebf2e4dfd518fc94303db10e08f379c1294f2f50cca198d1786cd99b23"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x1902ffe3b64b46b62e9eaf0b87901e3dcde7a09af62afb5aa8c7ff9f56e0d47b",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3beae907323f1a64988e5a0e261bb0ed83a3099f744988ca301819e5f11df080",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90294f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75fa03beae907323f1a64988e5a0e261bb0ed83a3099f744988ca301819e5f11df080a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f896f894800183030d408001b8476000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000551ba0400d01fbee4cd6f282e37d30701a8b9def8b9ab9525a9b39de005c00f80290fca03ec2ac7110338a288c5404555d5edc6af34dc1ce8bbfa0a030bb6409bec498b8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f55062112233600055",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x400d01fbee4cd6f282e37d30701a8b9def8b9ab9525a9b39de005c00f80290fc",
+                        "s" : "0x3ec2ac7110338a288c5404555d5edc6af34dc1ce8bbfa0a030bb6409bec498b8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1902ffe3b64b46b62e9eaf0b87901e3dcde7a09af62afb5aa8c7ff9f56e0d47b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62f0d40",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a760f2c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionSelfdestructedOOG_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json",
+            "sourceHash" : "7c0901ebf2e4dfd518fc94303db10e08f379c1294f2f50cca198d1786cd99b23"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x030d40",
+                    "hash" : "0x1902ffe3b64b46b62e9eaf0b87901e3dcde7a09af62afb5aa8c7ff9f56e0d47b",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
+                    "stateRoot" : "0x949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3beae907323f1a64988e5a0e261bb0ed83a3099f744988ca301819e5f11df080",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90294f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75fa03beae907323f1a64988e5a0e261bb0ed83a3099f744988ca301819e5f11df080a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f896f894800183030d408001b8476000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000551ba0400d01fbee4cd6f282e37d30701a8b9def8b9ab9525a9b39de005c00f80290fca03ec2ac7110338a288c5404555d5edc6af34dc1ce8bbfa0a030bb6409bec498b8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f55062112233600055",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x400d01fbee4cd6f282e37d30701a8b9def8b9ab9525a9b39de005c00f80290fc",
+                        "s" : "0x3ec2ac7110338a288c5404555d5edc6af34dc1ce8bbfa0a030bb6409bec498b8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1902ffe3b64b46b62e9eaf0b87901e3dcde7a09af62afb5aa8c7ff9f56e0d47b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62f0d40",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a760f2c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0.json
index 6456ef64f..8f079f6de 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionSelfdestructedRevert_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json",
-            "sourceHash" : "518121c1d699503d497c8857f130700632124a6ec9f4ad16bc99fd6456c37efa"
+            "sourceHash" : "55157b880e15b7698625667bf0c5d443360fe2e0b1d183c40a9a104fc9984556"
         },
         "blocks" : [
             {
@@ -16,28 +16,28 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe1f93134e180e620e3bb1591f37bfe883f9c540c5b5616a251f6b7f34f99823c",
+                    "hash" : "0x05beb725329faddf4e06c6fa1423736d86f1d6aa867eb89ac055231b8f10546e",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xaba8c8b7e6c1954be9bafa069bc04ec9b3aea31361d01d6a13cbcc9e975237f3",
+                    "stateRoot" : "0x43ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x2e080a9f5a28bc78103dd8b807ef22d26e45a52110a8b4192ca2a7257af7add4",
+                    "transactionsTrie" : "0x0f6ab87b02cea34d1a2668758ab8ba806b3fedd00924675097e373571574c230",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90287f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aba8c8b7e6c1954be9bafa069bc04ec9b3aea31361d01d6a13cbcc9e975237f3a02e080a9f5a28bc78103dd8b807ef22d26e45a52110a8b4192ca2a7257af7add4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f889f887800183061a808001b83a6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd1ba0960e876c974e4bd11f01c43b1b78db3d407c453bcfd608b692da2fd0a1af3e70a03414c7e97f382be2d3458d3e60b5c67b932f2672e790b082c7059154eb0ef025c0",
+                "rlp" : "0xf90287f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56a00f6ab87b02cea34d1a2668758ab8ba806b3fedd00924675097e373571574c230a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f889f887800183061a808001b83a6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd1ca0abaa7765012a257e7afb2c1e9dab591037ef9b215d0d7b5a3d82027f1965cb2fa02a22b608fb9b72ba335f91ca34e960d9f353840ab956049f3a7a6a7097d3dd74c0",
                 "transactions" : [
                     {
-                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd",
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x960e876c974e4bd11f01c43b1b78db3d407c453bcfd608b692da2fd0a1af3e70",
-                        "s" : "0x3414c7e97f382be2d3458d3e60b5c67b932f2672e790b082c7059154eb0ef025",
+                        "r" : "0xabaa7765012a257e7afb2c1e9dab591037ef9b215d0d7b5a3d82027f1965cb2f",
+                        "s" : "0x2a22b608fb9b72ba335f91ca34e960d9f353840ab956049f3a7a6a7097d3dd74",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x01"
                     }
                 ],
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1f93134e180e620e3bb1591f37bfe883f9c540c5b5616a251f6b7f34f99823c",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x05beb725329faddf4e06c6fa1423736d86f1d6aa867eb89ac055231b8f10546e",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,12 +81,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -97,23 +111,37 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionSelfdestructedRevert_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json",
-            "sourceHash" : "518121c1d699503d497c8857f130700632124a6ec9f4ad16bc99fd6456c37efa"
+            "sourceHash" : "55157b880e15b7698625667bf0c5d443360fe2e0b1d183c40a9a104fc9984556"
         },
         "blocks" : [
             {
@@ -123,29 +151,29 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06096e",
-                    "hash" : "0xf46af93112587c152618691c4cf7c8ddde416ce5517b6c70df0fd286b9117fc6",
+                    "gasUsed" : "0x06096f",
+                    "hash" : "0xce11878fe22261e5a7d2697038ff1caab8d3210ba20dbadb6734ec24a2219235",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
-                    "receiptTrie" : "0x8999e6e9e63c2491100c8c177aab64ab86d23adaf5ee5763872a9e36bd85adaa",
-                    "stateRoot" : "0x49f997200c95ea53ff0874ed133052fb165415e78d64ca6210dca3bba56cd6b2",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xfa0e1948223ffbacfe062be8991ca8d3497c0da5c56ddfbe40977e7467aeb5d0",
+                    "stateRoot" : "0x666dbdfe7257fd1e4ceae334f4e773607d6379ff9797a67ecd48317f219a15a7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x2e080a9f5a28bc78103dd8b807ef22d26e45a52110a8b4192ca2a7257af7add4",
+                    "transactionsTrie" : "0x0f6ab87b02cea34d1a2668758ab8ba806b3fedd00924675097e373571574c230",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90287f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa049f997200c95ea53ff0874ed133052fb165415e78d64ca6210dca3bba56cd6b2a02e080a9f5a28bc78103dd8b807ef22d26e45a52110a8b4192ca2a7257af7add4a08999e6e9e63c2491100c8c177aab64ab86d23adaf5ee5763872a9e36bd85adaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306096e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f889f887800183061a808001b83a6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd1ba0960e876c974e4bd11f01c43b1b78db3d407c453bcfd608b692da2fd0a1af3e70a03414c7e97f382be2d3458d3e60b5c67b932f2672e790b082c7059154eb0ef025c0",
+                "rlp" : "0xf90287f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0666dbdfe7257fd1e4ceae334f4e773607d6379ff9797a67ecd48317f219a15a7a00f6ab87b02cea34d1a2668758ab8ba806b3fedd00924675097e373571574c230a0fa0e1948223ffbacfe062be8991ca8d3497c0da5c56ddfbe40977e7467aeb5d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306096f8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f889f887800183061a808001b83a6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd1ca0abaa7765012a257e7afb2c1e9dab591037ef9b215d0d7b5a3d82027f1965cb2fa02a22b608fb9b72ba335f91ca34e960d9f353840ab956049f3a7a6a7097d3dd74c0",
                 "transactions" : [
                     {
-                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd",
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x960e876c974e4bd11f01c43b1b78db3d407c453bcfd608b692da2fd0a1af3e70",
-                        "s" : "0x3414c7e97f382be2d3458d3e60b5c67b932f2672e790b082c7059154eb0ef025",
+                        "r" : "0xabaa7765012a257e7afb2c1e9dab591037ef9b215d0d7b5a3d82027f1965cb2f",
+                        "s" : "0x2a22b608fb9b72ba335f91ca34e960d9f353840ab956049f3a7a6a7097d3dd74",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x01"
                     }
                 ],
@@ -160,41 +188,55 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf46af93112587c152618691c4cf7c8ddde416ce5517b6c70df0fd286b9117fc6",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xce11878fe22261e5a7d2697038ff1caab8d3210ba20dbadb6734ec24a2219235",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af632096e",
+                "balance" : "0x29a2241af632096f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75df692",
+                "balance" : "0x0de0b6b3a75df691",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -205,12 +247,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0.json
new file mode 100644
index 000000000..4e05065bd
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0.json
@@ -0,0 +1,274 @@
+{
+    "create2collisionSelfdestructedRevert_d1g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json",
+            "sourceHash" : "e7504fa63213cc7659cc980732f5510edddcba538630988f9c9e7dd29a58d7b9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0x81b45636ac365e1eb7778cd3d2f527d7a594f9932edbc8358a1c68b5d1840558",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x43ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x498b84fc08f0437115858afc3b7a7dc2584dcda04e2d3c43e05d3f11fc7f816b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90290f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56a0498b84fc08f0437115858afc3b7a7dc2584dcda04e2d3c43e05d3f11fc7f816ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f892f890800183061a808001b8436000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd1ca006c72773d9ec0a8d9a4a393422c5b62a7e4d482b187eca4839fc31d4a49d92fda01821cc26908d7c4f0b4fe954cf8ba91d3c648e0deb24c1dbe2e733cdc59e4a7dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06c72773d9ec0a8d9a4a393422c5b62a7e4d482b187eca4839fc31d4a49d92fd",
+                        "s" : "0x1821cc26908d7c4f0b4fe954cf8ba91d3c648e0deb24c1dbe2e733cdc59e4a7d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x81b45636ac365e1eb7778cd3d2f527d7a594f9932edbc8358a1c68b5d1840558",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionSelfdestructedRevert_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json",
+            "sourceHash" : "e7504fa63213cc7659cc980732f5510edddcba538630988f9c9e7dd29a58d7b9"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x060976",
+                    "hash" : "0x3fe6b297400886f0c32272b17e3b12d0610aa6ebce4245d805f63927f2d37f65",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xd7380df08e31efeb86321894e048774de3ad4572a1504cd9a6d8cdaa7a4df13b",
+                    "stateRoot" : "0x2ed2b788d9862206f041520a9ee03506c015c3de80daab92bb6eeb8037a7e069",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x498b84fc08f0437115858afc3b7a7dc2584dcda04e2d3c43e05d3f11fc7f816b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90290f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02ed2b788d9862206f041520a9ee03506c015c3de80daab92bb6eeb8037a7e069a0498b84fc08f0437115858afc3b7a7dc2584dcda04e2d3c43e05d3f11fc7f816ba0d7380df08e31efeb86321894e048774de3ad4572a1504cd9a6d8cdaa7a4df13bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830609768203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f892f890800183061a808001b8436000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd1ca006c72773d9ec0a8d9a4a393422c5b62a7e4d482b187eca4839fc31d4a49d92fda01821cc26908d7c4f0b4fe954cf8ba91d3c648e0deb24c1dbe2e733cdc59e4a7dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06c72773d9ec0a8d9a4a393422c5b62a7e4d482b187eca4839fc31d4a49d92fd",
+                        "s" : "0x1821cc26908d7c4f0b4fe954cf8ba91d3c648e0deb24c1dbe2e733cdc59e4a7d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3fe6b297400886f0c32272b17e3b12d0610aa6ebce4245d805f63927f2d37f65",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6320976",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75df68a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0.json
new file mode 100644
index 000000000..951a7fce5
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0.json
@@ -0,0 +1,274 @@
+{
+    "create2collisionSelfdestructedRevert_d2g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json",
+            "sourceHash" : "6d32a179d5b5763dc2358546e7fc2822623f3d2215ca39c865a74b8b9f938c4c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0xbbf77358bbd81787d7132ce6d5c48ae740fb966eb4e0573ad60fe90bbc36a206",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x43ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3a24300e873f6d4db115964a71ff0dc85cdaa2695a2fff95931a0c44be348023",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90299f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56a03a24300e873f6d4db115964a71ff0dc85cdaa2695a2fff95931a0c44be348023a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f89bf899800183061a808001b84c6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd1ca024c1a4a1f47eb30f0d674c8ecd87cecd868652abfaa828e9bd9201cdd01f62c6a0667d69fde64034e7a20ac0da13137c43e5baf6ce477f1527e954ff374fbf26cdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24c1a4a1f47eb30f0d674c8ecd87cecd868652abfaa828e9bd9201cdd01f62c6",
+                        "s" : "0x667d69fde64034e7a20ac0da13137c43e5baf6ce477f1527e954ff374fbf26cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbbf77358bbd81787d7132ce6d5c48ae740fb966eb4e0573ad60fe90bbc36a206",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionSelfdestructedRevert_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json",
+            "sourceHash" : "6d32a179d5b5763dc2358546e7fc2822623f3d2215ca39c865a74b8b9f938c4c"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x06097f",
+                    "hash" : "0x6a89adf3f7c5edae79454c74daa0ce609c0704d4a9636aa8b0d6d5a3abc115b9",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xbab692e75bedb513574bba889199d2f422da1ca1f0645b4495b7dcd30ef450dd",
+                    "stateRoot" : "0xf07203611d9da6c88d1da6cf2f8afdc19cef4a07f1fa3818bd923be1ded969a6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3a24300e873f6d4db115964a71ff0dc85cdaa2695a2fff95931a0c44be348023",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90299f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f07203611d9da6c88d1da6cf2f8afdc19cef4a07f1fa3818bd923be1ded969a6a03a24300e873f6d4db115964a71ff0dc85cdaa2695a2fff95931a0c44be348023a0bab692e75bedb513574bba889199d2f422da1ca1f0645b4495b7dcd30ef450ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306097f8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f89bf899800183061a808001b84c6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd1ca024c1a4a1f47eb30f0d674c8ecd87cecd868652abfaa828e9bd9201cdd01f62c6a0667d69fde64034e7a20ac0da13137c43e5baf6ce477f1527e954ff374fbf26cdc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24c1a4a1f47eb30f0d674c8ecd87cecd868652abfaa828e9bd9201cdd01f62c6",
+                        "s" : "0x667d69fde64034e7a20ac0da13137c43e5baf6ce477f1527e954ff374fbf26cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6a89adf3f7c5edae79454c74daa0ce609c0704d4a9636aa8b0d6d5a3abc115b9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af632097f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75df681",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json
index 5716da077..d771e9e77 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionSelfdestructed_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "collision with address that has been selfdestructed in the same transaction",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json",
-            "sourceHash" : "527a7777595f330353b70425fbf29fee7675cf8d406f9b0cef802a7d99180dfd"
+            "sourceHash" : "2428d9d4ac82e19570afb59a7431938920fcb28d446ff6a751067218680cf913"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5b795842170f0b507c22d903a67107e3bfeab686154c0515bd6ee4f9f39d1ed3",
+                    "hash" : "0xf4506629f36ff59dfc363382fa6b2282d974f98bba8b4147613aefe7327b8f80",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xaba8c8b7e6c1954be9bafa069bc04ec9b3aea31361d01d6a13cbcc9e975237f3",
+                    "stateRoot" : "0x43ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90279f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aba8c8b7e6c1954be9bafa069bc04ec9b3aea31361d01d6a13cbcc9e975237f3a02134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f87bf879800183061a808001ad6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f51ca0e2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96a032326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368c0",
+                "rlp" : "0xf90279f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56a02134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f87bf879800183061a808001ad6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f51ca0e2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96a032326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b795842170f0b507c22d903a67107e3bfeab686154c0515bd6ee4f9f39d1ed3",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf4506629f36ff59dfc363382fa6b2282d974f98bba8b4147613aefe7327b8f80",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,12 +81,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -97,23 +111,37 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionSelfdestructed_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "collision with address that has been selfdestructed in the same transaction",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json",
-            "sourceHash" : "527a7777595f330353b70425fbf29fee7675cf8d406f9b0cef802a7d99180dfd"
+            "sourceHash" : "2428d9d4ac82e19570afb59a7431938920fcb28d446ff6a751067218680cf913"
         },
         "blocks" : [
             {
@@ -124,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x05ab8e",
-                    "hash" : "0x06a2cc23083a7b424171bb13a4c0c23cbd626cbc8cd54c3e9c305b052e79f27f",
+                    "hash" : "0x44eaddbcc1bc05da3c7aa4e65abd995ba338371132404066ecab1017fb96f7e3",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xa9b782ef61e26fa58def53065af531544dfafc2b722b766783c58ed00bff0910",
-                    "stateRoot" : "0x93811df3d9049da420fead6929f0172f941dfc0d964bc16762e61efd3977e98d",
+                    "stateRoot" : "0x0e957284c023f460719c32e9c21c8753b0b28a6520a72c3783549dbe2fcf412c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90279f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093811df3d9049da420fead6929f0172f941dfc0d964bc16762e61efd3977e98da02134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929a0a9b782ef61e26fa58def53065af531544dfafc2b722b766783c58ed00bff0910b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408305ab8e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f87bf879800183061a808001ad6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f51ca0e2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96a032326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368c0",
+                "rlp" : "0xf90279f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e957284c023f460719c32e9c21c8753b0b28a6520a72c3783549dbe2fcf412ca02134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929a0a9b782ef61e26fa58def53065af531544dfafc2b722b766783c58ed00bff0910b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408305ab8e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f87bf879800183061a808001ad6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f51ca0e2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96a032326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5",
@@ -160,19 +188,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06a2cc23083a7b424171bb13a4c0c23cbd626cbc8cd54c3e9c305b052e79f27f",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x44eaddbcc1bc05da3c7aa4e65abd995ba338371132404066ecab1017fb96f7e3",
         "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000010" : {
@@ -202,6 +230,20 @@
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -212,12 +254,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0.json
new file mode 100644
index 000000000..92f3708ed
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0.json
@@ -0,0 +1,281 @@
+{
+    "create2collisionSelfdestructed_d1g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json",
+            "sourceHash" : "e0e01338e0ecce17268fa777888374d7fd6d3f9b30230da3b1664aec4416ec35"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0xecfe670b36096d38ef8f336d1a3071814818d24c973094503c40a869e839d959",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x43ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc0836c261890efc708ebc0a2a89164c4fae93dcc81416089cdb9d4747b40986d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90282f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56a0c0836c261890efc708ebc0a2a89164c4fae93dcc81416089cdb9d4747b40986da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f884f882800183061a808001b66000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f51ba08ed34060c3b876c8807ad84619a57d33c0a1f2159be991a3c0c1650659ee76aea03f4cb699c2fa9e9cd49f8dbba7e28ea2b5736919939d196eb353d2821a55d97ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ed34060c3b876c8807ad84619a57d33c0a1f2159be991a3c0c1650659ee76ae",
+                        "s" : "0x3f4cb699c2fa9e9cd49f8dbba7e28ea2b5736919939d196eb353d2821a55d97a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xecfe670b36096d38ef8f336d1a3071814818d24c973094503c40a869e839d959",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionSelfdestructed_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json",
+            "sourceHash" : "e0e01338e0ecce17268fa777888374d7fd6d3f9b30230da3b1664aec4416ec35"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x05ab98",
+                    "hash" : "0x514f470e57023997daed20f1416548c94e7c33c66d4817fbf97401b62bf66936",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0x4d45d2d2d06a964dd767eb1dabbae67e1c1b052d5b379ef1f82110af2117d902",
+                    "stateRoot" : "0x18978367481486dcff7f336473715333f17a48697f246c557390af0a5c49d997",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc0836c261890efc708ebc0a2a89164c4fae93dcc81416089cdb9d4747b40986d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90282f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa018978367481486dcff7f336473715333f17a48697f246c557390af0a5c49d997a0c0836c261890efc708ebc0a2a89164c4fae93dcc81416089cdb9d4747b40986da04d45d2d2d06a964dd767eb1dabbae67e1c1b052d5b379ef1f82110af2117d902b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408305ab988203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f884f882800183061a808001b66000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f51ba08ed34060c3b876c8807ad84619a57d33c0a1f2159be991a3c0c1650659ee76aea03f4cb699c2fa9e9cd49f8dbba7e28ea2b5736919939d196eb353d2821a55d97ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ed34060c3b876c8807ad84619a57d33c0a1f2159be991a3c0c1650659ee76ae",
+                        "s" : "0x3f4cb699c2fa9e9cd49f8dbba7e28ea2b5736919939d196eb353d2821a55d97a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x514f470e57023997daed20f1416548c94e7c33c66d4817fbf97401b62bf66936",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000010" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af631ab98",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75e5467",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0.json
new file mode 100644
index 000000000..ebaceb2c1
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0.json
@@ -0,0 +1,281 @@
+{
+    "create2collisionSelfdestructed_d2g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json",
+            "sourceHash" : "be9ec5f6e8ee33b85bb1ef051d97bc9b20d7abb716c45314ea307aef4e6d2750"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0x03f4eed97cd30f1f1451e06ee59f19fa6d41524a8199494cc15011e09b81c6bb",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0x43ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x156718b473fa29a0b1ee7d6a78ee2e5341c61336c705a9bd13994036162b752c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9028cf901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56a0156718b473fa29a0b1ee7d6a78ee2e5341c61336c705a9bd13994036162b752ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f88ef88c800183061a808001b83f6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f51ca0e273305d3f7274b4240a41448355f706a1a49a006a68367590f80753163238bea048999c9f182c1de512a97a387f0e09cbde89cfd668319658a1a3c8ec76872ba6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe273305d3f7274b4240a41448355f706a1a49a006a68367590f80753163238be",
+                        "s" : "0x48999c9f182c1de512a97a387f0e09cbde89cfd668319658a1a3c8ec76872ba6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x03f4eed97cd30f1f1451e06ee59f19fa6d41524a8199494cc15011e09b81c6bb",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionSelfdestructed_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json",
+            "sourceHash" : "be9ec5f6e8ee33b85bb1ef051d97bc9b20d7abb716c45314ea307aef4e6d2750"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x05aba1",
+                    "hash" : "0xc9c414e65a71795cf0922a43a385818a64e61b453e66e249ba45bd81dc43c91a",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+                    "receiptTrie" : "0x0869a6532b5ce7b9f68b7986b77277403d5403fa680eefd92e6be200e5359fc8",
+                    "stateRoot" : "0xa30ca5d2c0ca7781c2768d1be2e7d0d6d841f6fd1a8e0764607162e7cf53db0f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x156718b473fa29a0b1ee7d6a78ee2e5341c61336c705a9bd13994036162b752c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9028cf901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a30ca5d2c0ca7781c2768d1be2e7d0d6d841f6fd1a8e0764607162e7cf53db0fa0156718b473fa29a0b1ee7d6a78ee2e5341c61336c705a9bd13994036162b752ca00869a6532b5ce7b9f68b7986b77277403d5403fa680eefd92e6be200e5359fc8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408305aba18203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f88ef88c800183061a808001b83f6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f51ca0e273305d3f7274b4240a41448355f706a1a49a006a68367590f80753163238bea048999c9f182c1de512a97a387f0e09cbde89cfd668319658a1a3c8ec76872ba6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe273305d3f7274b4240a41448355f706a1a49a006a68367590f80753163238be",
+                        "s" : "0x48999c9f182c1de512a97a387f0e09cbde89cfd668319658a1a3c8ec76872ba6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc9c414e65a71795cf0922a43a385818a64e61b453e66e249ba45bd81dc43c91a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000010" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af631aba1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75e545e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json
index 2fa932762..67c065b10 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionStorage_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has storage != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json",
-            "sourceHash" : "215a730812835e8ceb0a30b9bcff79ccf9cd163d160f0d86a63a9aa434f7902b"
+            "sourceHash" : "cb504c6d6321afb29a71bc36cfca25d289d663bc65b5897c9d96d4c1f5c32927"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf9865aa65cda4a72778a6976a33acb9d291805612c9d12089aec863d4821f8e3",
+                    "hash" : "0x49e4a88f7f0ba2f119d6596176faee3699502bdf970d062245561325a30e33aa",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x9055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb2a54640c5dbef94d20fb236a51a66a824dcf161a6b52e1c31400c2a988a83d8",
+                    "stateRoot" : "0xae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a09055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2a54640c5dbef94d20fb236a51a66a824dcf161a6b52e1c31400c2a988a83d8a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013ba0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x9055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc4747a8f3ff0eae3630afe952ee762e6770e7dc20e78e7d34a57ebf631163d01",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4747a8f3ff0eae3630afe952ee762e6770e7dc20e78e7d34a57ebf631163d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9865aa65cda4a72778a6976a33acb9d291805612c9d12089aec863d4821f8e3",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x49e4a88f7f0ba2f119d6596176faee3699502bdf970d062245561325a30e33aa",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,6 +81,14 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -88,6 +96,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "pre" : {
@@ -98,6 +114,14 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -105,17 +129,25 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionStorage_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has storage != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json",
-            "sourceHash" : "215a730812835e8ceb0a30b9bcff79ccf9cd163d160f0d86a63a9aa434f7902b"
+            "sourceHash" : "cb504c6d6321afb29a71bc36cfca25d289d663bc65b5897c9d96d4c1f5c32927"
         },
         "blocks" : [
             {
@@ -126,18 +158,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x014d78",
-                    "hash" : "0x3ab80d409cdfe96a5cad20dea8dcc90d96c81c27aa69085f8a59c05f2b94d774",
+                    "hash" : "0x598074c7d316c51d5eb6602da052366600c01b199e35da7388a749d7ad43abd6",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x9055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
                     "receiptTrie" : "0x0280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345",
-                    "stateRoot" : "0xb8de3d4ee275ea71447637a3d27b4f6c9fa785beaff6e6c7ea923625623b9c24",
+                    "stateRoot" : "0x20dd2218fb0755ea371bc5657ef8677477165bfd12b9571324c6a5a50a1dd283",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a09055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8de3d4ee275ea71447637a3d27b4f6c9fa785beaff6e6c7ea923625623b9c24a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a00280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014d788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020dd2218fb0755ea371bc5657ef8677477165bfd12b9571324c6a5a50a1dd283a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a00280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014d788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -162,19 +194,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x9055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc4747a8f3ff0eae3630afe952ee762e6770e7dc20e78e7d34a57ebf631163d01",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4747a8f3ff0eae3630afe952ee762e6770e7dc20e78e7d34a57ebf631163d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ab80d409cdfe96a5cad20dea8dcc90d96c81c27aa69085f8a59c05f2b94d774",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x598074c7d316c51d5eb6602da052366600c01b199e35da7388a749d7ad43abd6",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -198,11 +230,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
                     "0x00" : "0x01"
                 }
             }
@@ -215,6 +262,14 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -222,6 +277,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json
new file mode 100644
index 000000000..c8143ad6e
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json
@@ -0,0 +1,293 @@
+{
+    "create2collisionStorage_d1g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has storage != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json",
+            "sourceHash" : "54181bee67b571f67c4db03cf9febd94a9c6c9ae1d6cf264a486372e98736d97"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0x0a0348178b571f4e210ac925ffc90c233181df016eb7290175b8f1b90e819c11",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0xae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013ba0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0a0348178b571f4e210ac925ffc90c233181df016eb7290175b8f1b90e819c11",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionStorage_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has storage != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json",
+            "sourceHash" : "54181bee67b571f67c4db03cf9febd94a9c6c9ae1d6cf264a486372e98736d97"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x019e4e",
+                    "hash" : "0x2139b6fc23f1231b965d6cba5e29b50ed533f8494f9afdd254985d8b8296348c",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
+                    "receiptTrie" : "0x908fdf67d77ea4340d0d868e513eb0b5c689dfc14418e6beffd11356b6fbc802",
+                    "stateRoot" : "0xb7da40bf9d3f5dd8e147a49aef2ac56da8460c5ad1189d2c58ee633e1284d19a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b7da40bf9d3f5dd8e147a49aef2ac56da8460c5ad1189d2c58ee633e1284d19aa0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0908fdf67d77ea4340d0d868e513eb0b5c689dfc14418e6beffd11356b6fbc802b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019e4e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2139b6fc23f1231b965d6cba5e29b50ed533f8494f9afdd254985d8b8296348c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d9e4e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76261b1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0.json
new file mode 100644
index 000000000..135090938
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0.json
@@ -0,0 +1,292 @@
+{
+    "create2collisionStorage_d2g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has storage != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json",
+            "sourceHash" : "8dd050819a5c6825de4a8add6d2a745248a51a514a157b068c1c5b0784323798"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x061a80",
+                    "hash" : "0x0e9fa38423c44d9b45795abd0a836bae9347c994f9d0d78735cc4437986cf120",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
+                    "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
+                    "stateRoot" : "0xae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013ba06144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f869f867800183061a8080019b6d6460016001556000526005601bf36000526000600e60126000f51ba06e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935a0672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0e9fa38423c44d9b45795abd0a836bae9347c994f9d0d78735cc4437986cf120",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af6321a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a75de580",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "create2collisionStorage_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has storage != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json",
+            "sourceHash" : "8dd050819a5c6825de4a8add6d2a745248a51a514a157b068c1c5b0784323798"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x015646",
+                    "hash" : "0x2651d55b8124a5710ab293f6adf84210a99199086a33a76a726e7619a7cd4a9d",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
+                    "receiptTrie" : "0xbf08a27ebea5aee35a1889502d1d9cd784e7c503ac3c2d9f6275286fb518f574",
+                    "stateRoot" : "0x4e98b0f61819ef28be5dc5523cd9d38ca3d4b73488679b3961f72df058fdba84",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90267f901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e98b0f61819ef28be5dc5523cd9d38ca3d4b73488679b3961f72df058fdba84a06144de85fad56b987e77487e31caf3e5c944cff3f2f4b2353f67f28e304dd131a0bf08a27ebea5aee35a1889502d1d9cd784e7c503ac3c2d9f6275286fb518f574b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830156468203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f869f867800183061a8080019b6d6460016001556000526005601bf36000526000600e60126000f51ba06e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935a0672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2651d55b8124a5710ab293f6adf84210a99199086a33a76a726e7619a7cd4a9d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d5646",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a9b9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionBalance.json b/GeneralStateTests/stCreate2/create2collisionBalance.json
index aa93e3d8d..2c6c08862 100644
--- a/GeneralStateTests/stCreate2/create2collisionBalance.json
+++ b/GeneralStateTests/stCreate2/create2collisionBalance.json
@@ -2,10 +2,10 @@
     "create2collisionBalance" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has balance != 0",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json",
-            "sourceHash" : "bd0821b3a8bde26a77b61300b4d2a6fb39c6fc13ddbd6f2ecfd9d23edbe943c7"
+            "sourceHash" : "1245420c316e622ebba93f732e8500dd971bd2de495d552a67868a66223484ed"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,78 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0x455afcc8ac854a58135d6b56c9b71446b6f13fd49bc75444572be50918a4a9e5",
+                    "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0xac2995edb932912509f3202ee433ed00712b9d0e6cf5578369da03ff73d50f01",
+                    "hash" : "0x69b97ecb350ab7c49e0ffbea5dd5ee872dc2dab90e8fca9d6ecae2b16f61c3cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x8d299acd82371ffd6826b9cdcfc0be4c45be08342871fae38bd934e536c4416f",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x126134d4e196a778bb0a5a4dc8740f837fad149dfd5a76741e7b7b82eb583319",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa616341f188981f5b84d7e67e3e8c9f460c77255b725bf6a79a4b024d6169f54",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +101,34 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000f5"
+                "0x6000600060006000f5",
+                "0x64600160015560005260006005601b6000f5",
+                "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "0x6000600060006001f5"
             ],
             "gasLimit" : [
                 "0x061a80"
diff --git a/GeneralStateTests/stCreate2/create2collisionCode.json b/GeneralStateTests/stCreate2/create2collisionCode.json
index 36f6e2f55..aac485240 100644
--- a/GeneralStateTests/stCreate2/create2collisionCode.json
+++ b/GeneralStateTests/stCreate2/create2collisionCode.json
@@ -2,10 +2,10 @@
     "create2collisionCode" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has not empty code",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json",
-            "sourceHash" : "4f997537a448d0024ea20a53d9673afa9324d9633ec7e8b97bd74073b40a25b9"
+            "sourceHash" : "a29d584a2e2c0ef915616ed1fbc5696ccbceca975f22d3089733f6e01cb72ccb"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0x99f1f2d802c0e3d46619a143e236f1a8390f8b524553c8fd18b678317b377654",
+                    "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0x171ffc2b7bf5a9a8fcfb5d7a4b799c4069dc16f3b5b4d3837606b17b696b15f7",
+                    "hash" : "0x72761ce2124ae982e88a5df41c464119c592355ad9c41c9c5b8435d69ab52103",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x9feab867ac14d2dd0d61befa8486adf4c9b70c13d47453d66f382f0a20202da6",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xee7e793da89342c335e3c6dba89d64ea1068cb9ee6d56276a0f351e079beba83",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +83,33 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "0x010203",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000f5"
+                "0x6000600060006000f5",
+                "0x64600160015560005260006005601b6000f5",
+                "0x6d6460016001556000526005601bf36000526000600e60126000f5"
             ],
             "gasLimit" : [
                 "0x061a80"
diff --git a/GeneralStateTests/stCreate2/create2collisionNonce.json b/GeneralStateTests/stCreate2/create2collisionNonce.json
index f73d751b8..895059761 100644
--- a/GeneralStateTests/stCreate2/create2collisionNonce.json
+++ b/GeneralStateTests/stCreate2/create2collisionNonce.json
@@ -2,10 +2,10 @@
     "create2collisionNonce" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has nonce != 0",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json",
-            "sourceHash" : "7431f28384a4f97499e69173aed899f15fe936a5ed4e955e86cd428285f1b914"
+            "sourceHash" : "d04a1fa39a8582d4ec0e9297d0f2139cc88bbe13ce063007bc850c5bc5d88c32"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0x2f7b8ca16fa10a0164dedaac1c008f20ea5ea0cf67a74d173336a7b6baab71fd",
+                    "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0x1f471deaed5abf11e6b12d254b69d228ce820dad5a8e248c506d47a7d2e820f1",
+                    "hash" : "0x8b8cabd2a732dc61eeb2994112158afd4fe7efd40ffd32ed5a706e879a660898",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4d42c80258f15c835e22e74dc8db15f00365406b23371074199b6fa0ad093626",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x8b248f79f0627f2400a0a72d9cf6d3b078828072f7e7e205ee644396c4a747d1",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +83,33 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000f5"
+                "0x6000600060006000f5",
+                "0x64600160015560005260006005601b6000f5",
+                "0x6d6460016001556000526005601bf36000526000600e60126000f5"
             ],
             "gasLimit" : [
                 "0x061a80"
diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json
index b572b20f0..b64d21a66 100644
--- a/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json
@@ -2,10 +2,10 @@
     "create2collisionSelfdestructed" : {
         "_info" : {
             "comment" : "collision with address that has been selfdestructed in the same transaction",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json",
-            "sourceHash" : "aa82221fe6312dc15add5fd8f69342605fa83c8c1b2a870139a9833dd2876eb6"
+            "sourceHash" : "3fb1c7dddc5371db434a9e68024f28d515d099048a2c5064522d00063ba5dfeb"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xa0652ee361902645d869d84d6cfe814679e9a318e09205e6de48a9fbdcd33760",
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0x0ac1dfa111dfd2f876591a97b67faea1440596694e5a32e1092e28243757ce50",
+                    "hash" : "0xf5d89299a22e4cdce4895c65d7cd610286308f5676ec92de4778f15be8cd284a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x6b114efa7d4ce347a9687858e822520cdfc255d618d5f1b2f73448db0a2c252c",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x3a67e2d3c0824ce01741983ea15167291c4f140d65449366828df0df537f7726",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +83,33 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5"
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5",
+                "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f5",
+                "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f5"
             ],
             "gasLimit" : [
                 "0x061a80"
diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json
index 804d05fff..f33a0725f 100644
--- a/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json
@@ -2,10 +2,10 @@
     "create2collisionSelfdestructedOOG" : {
         "_info" : {
             "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json",
-            "sourceHash" : "6b3e76fd94ad0d4b63c4f0709b9a08e407681128ee046157ac29be87f61610ea"
+            "sourceHash" : "77cbd98bf19a333fb67d41d07874d0d68b9087ffdcbadcb79f0e88dd9ea5eec0"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xa83baf40800c1629194bdaf2ebf00aec1366ddf24b457610eec75fe199d29720",
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0xa83baf40800c1629194bdaf2ebf00aec1366ddf24b457610eec75fe199d29720",
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +83,33 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055"
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055",
+                "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f55062112233600055",
+                "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f55062112233600055"
             ],
             "gasLimit" : [
                 "0x030d40"
diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json
index 57274403b..2841f7cc1 100644
--- a/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json
@@ -2,10 +2,10 @@
     "create2collisionSelfdestructedRevert" : {
         "_info" : {
             "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json",
-            "sourceHash" : "5ee9f4ff1a2bbba51a007aab9a4fb4c771fe44b3cdf6c840d670a803c649f4a0"
+            "sourceHash" : "3cf7bd53e01efb8c6e4cc18108d35e3af6db95b868cccf728383ba65e30665c6"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xa0652ee361902645d869d84d6cfe814679e9a318e09205e6de48a9fbdcd33760",
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0x4d7794f8ec48cb043fce08a7d9e53ead7016a4441408e05de50e0aefbaf33a08",
+                    "hash" : "0x67ee8792884cb74ca16898a91dad472752d48af97b491a004e0b04b6ff11fd1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xc340c1ded39af2c0921a1ff70f07e73b761a05e1872bcda26d82074aacdac7a0",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xfe7f548b1a6d01545688f701ee883f6411b6dc6e79e0b281889cff2fcc5e8cb7",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +83,33 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd"
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd",
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd",
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd"
             ],
             "gasLimit" : [
                 "0x061a80"
diff --git a/GeneralStateTests/stCreate2/create2collisionStorage.json b/GeneralStateTests/stCreate2/create2collisionStorage.json
index a730a12ac..f6ca45913 100644
--- a/GeneralStateTests/stCreate2/create2collisionStorage.json
+++ b/GeneralStateTests/stCreate2/create2collisionStorage.json
@@ -2,10 +2,10 @@
     "create2collisionStorage" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has storage != 0",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json",
-            "sourceHash" : "c46b7b85b0e53dabfe9c426e3985546f4d218dceaccb5a1fa1af921b6ea49136"
+            "sourceHash" : "c9586bfff17277724cafec14ccde2e03743d9d2ceb7379eb7c0a87c2b5ef5319"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xd086ddbd06a36f9f5f78ea4cfd39f0930fec271fda68a786e0dac75b1c4f5e69",
+                    "hash" : "0x18e3ce957cf4cc8951cb61e12b06d58eafce93595d5df2bb9d9899bcd96aa1a3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x18e3ce957cf4cc8951cb61e12b06d58eafce93595d5df2bb9d9899bcd96aa1a3",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x18e3ce957cf4cc8951cb61e12b06d58eafce93595d5df2bb9d9899bcd96aa1a3",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0xc5f9c36d995fd94ffad0bbcaf4ab01183bf7574152dcca0182d3c4e4720434e0",
+                    "hash" : "0x711de9a6053077c237823f2c0db69668e1a68662953ed74f69793f3754644d93",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xecfcb034a3f39a5591b1aa0534f24e5a3849d2c22df0de1b7ebe486c86c57e60",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xd339d4828e0e9e7118e32dcf585eaf7dd4f2d8f1e9a1a9e1c9496039fc0bb529",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,6 +83,14 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -54,11 +98,21 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000f5"
+                "0x6000600060006000f5",
+                "0x64600160015560005260006005601b6000f5",
+                "0x6d6460016001556000526005601bf36000526000600e60126000f5"
             ],
             "gasLimit" : [
                 "0x061a80"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json
index cb689d31f..f8dd2dd83 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json
@@ -1,5 +1,8 @@
 {
     "create2collisionBalance_d0g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0"
+        },
         "blocks" : [
             {
                 "blockHeaderPremine" : {
@@ -82,12 +85,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json
new file mode 100644
index 000000000..9d202fe0e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json
@@ -0,0 +1,116 @@
+{
+    "create2collisionBalance_d1g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x01" : "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json
new file mode 100644
index 000000000..c7aff5d38
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json
@@ -0,0 +1,115 @@
+{
+    "create2collisionBalance_d2g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x01",
+                        "code" : "0x6001600155",
+                        "nonce" : "0x01",
+                        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json
new file mode 100644
index 000000000..61af0c782
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json
@@ -0,0 +1,112 @@
+{
+    "create2collisionBalance_d3g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has balance != 0"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006001f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbcb8e3b988ef2600800744cbd56a589545f6835ba785bd1294cbfd4269475e5f",
+                        "s" : "0x364cd8be570ac583145288da8593dce1f18b3886f33ef75133779d02babaec14",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x00",
+                        "nonce" : "0x02"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x02",
+                        "nonce" : "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json
index 3558d29b1..2fcacb95e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json
@@ -1,5 +1,8 @@
 {
     "create2collisionCode_d0g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has not empty code"
+        },
         "blocks" : [
             {
                 "blockHeaderPremine" : {
@@ -52,10 +55,26 @@
                     "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0x01"
                     },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
                     "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                         "balance" : "0x00",
                         "code" : "0x010203",
-                        "nonce" : "0x00"
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
                     }
                 }
             }
@@ -85,12 +104,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "0x010203",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json
new file mode 100644
index 000000000..7c1a66320
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json
@@ -0,0 +1,131 @@
+{
+    "create2collisionCode_d1g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has not empty code"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x02"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00",
+                        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json
new file mode 100644
index 000000000..50d065610
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json
@@ -0,0 +1,131 @@
+{
+    "create2collisionCode_d2g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has not empty code"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x02"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x00",
+                        "code" : "0x010203",
+                        "nonce" : "0x00",
+                        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json
index 87435970d..df9e1e008 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json
@@ -1,5 +1,8 @@
 {
     "create2collisionNonce_d0g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has nonce != 0"
+        },
         "blocks" : [
             {
                 "blockHeaderPremine" : {
@@ -50,9 +53,26 @@
                     "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0x01"
                     },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    },
                     "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                         "balance" : "0x00",
-                        "nonce" : "0x01"
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
                     }
                 }
             }
@@ -82,12 +102,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json
new file mode 100644
index 000000000..20ce675e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json
@@ -0,0 +1,129 @@
+{
+    "create2collisionNonce_d1g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has nonce != 0"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "nonce" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json
new file mode 100644
index 000000000..f20fe5c4e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json
@@ -0,0 +1,129 @@
+{
+    "create2collisionNonce_d2g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has nonce != 0"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "nonce" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json
index 0955437ef..beb3ead2e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json
@@ -1,5 +1,8 @@
 {
     "create2collisionSelfdestructedOOG_d0g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG"
+        },
         "blocks" : [
             {
                 "blockHeaderPremine" : {
@@ -51,9 +54,17 @@
                     "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0x01"
                     },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
                     "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                         "balance" : "0x01",
                         "code" : "0x6010ff"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
                     }
                 }
             }
@@ -83,12 +94,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json
new file mode 100644
index 000000000..65521d9dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json
@@ -0,0 +1,121 @@
+{
+    "create2collisionSelfdestructedOOG_d1g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f55062112233600055",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0f0aee182bd978f7c158b0cd8d4e302186af634691f09f2f6ded35435b3a67c",
+                        "s" : "0x2f6dc01df80d1f8d4281bb3db9090054b64085ae9756ed75e4165167d654c2c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    }
+                }
+            }
+        ],
+        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json
new file mode 100644
index 000000000..2fe52c93d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json
@@ -0,0 +1,121 @@
+{
+    "create2collisionSelfdestructedOOG_d2g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f55062112233600055",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x400d01fbee4cd6f282e37d30701a8b9def8b9ab9525a9b39de005c00f80290fc",
+                        "s" : "0x3ec2ac7110338a288c5404555d5edc6af34dc1ce8bbfa0a030bb6409bec498b8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    }
+                }
+            }
+        ],
+        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json
index f77608e49..049474e58 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json
@@ -1,5 +1,8 @@
 {
     "create2collisionSelfdestructedRevert_d0g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called"
+        },
         "blocks" : [
             {
                 "blockHeaderPremine" : {
@@ -10,14 +13,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd",
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x960e876c974e4bd11f01c43b1b78db3d407c453bcfd608b692da2fd0a1af3e70",
-                        "s" : "0x3414c7e97f382be2d3458d3e60b5c67b932f2672e790b082c7059154eb0ef025",
+                        "r" : "0xabaa7765012a257e7afb2c1e9dab591037ef9b215d0d7b5a3d82027f1965cb2f",
+                        "s" : "0x2a22b608fb9b72ba335f91ca34e960d9f353840ab956049f3a7a6a7097d3dd74",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x01"
                     }
                 ],
@@ -51,9 +54,17 @@
                     "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "nonce" : "0x01"
                     },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
                     "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                         "balance" : "0x01",
                         "code" : "0x6010ff"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
                     }
                 }
             }
@@ -83,12 +94,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json
new file mode 100644
index 000000000..8d5d02e9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json
@@ -0,0 +1,121 @@
+{
+    "create2collisionSelfdestructedRevert_d1g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06c72773d9ec0a8d9a4a393422c5b62a7e4d482b187eca4839fc31d4a49d92fd",
+                        "s" : "0x1821cc26908d7c4f0b4fe954cf8ba91d3c648e0deb24c1dbe2e733cdc59e4a7d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    }
+                }
+            }
+        ],
+        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json
new file mode 100644
index 000000000..38c889ea4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json
@@ -0,0 +1,121 @@
+{
+    "create2collisionSelfdestructedRevert_d2g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24c1a4a1f47eb30f0d674c8ecd87cecd868652abfaa828e9bd9201cdd01f62c6",
+                        "s" : "0x667d69fde64034e7a20ac0da13137c43e5baf6ce477f1527e954ff374fbf26cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x01",
+                        "code" : "0x6010ff"
+                    }
+                }
+            }
+        ],
+        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json
index ec0aac8be..c57385216 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json
@@ -1,5 +1,8 @@
 {
     "create2collisionSelfdestructed_d0g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction"
+        },
         "blocks" : [
             {
                 "blockHeaderPremine" : {
@@ -86,12 +89,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json
new file mode 100644
index 000000000..84d2fad12
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json
@@ -0,0 +1,116 @@
+{
+    "create2collisionSelfdestructed_d1g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ed34060c3b876c8807ad84619a57d33c0a1f2159be991a3c0c1650659ee76ae",
+                        "s" : "0x3f4cb699c2fa9e9cd49f8dbba7e28ea2b5736919939d196eb353d2821a55d97a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                        "balance" : "0x01"
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json
new file mode 100644
index 000000000..d1e9d1140
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json
@@ -0,0 +1,116 @@
+{
+    "create2collisionSelfdestructed_d2g0v0" : {
+        "_info" : {
+            "comment" : "collision with address that has been selfdestructed in the same transaction"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe273305d3f7274b4240a41448355f706a1a49a006a68367590f80753163238be",
+                        "s" : "0x48999c9f182c1de512a97a387f0e09cbde89cfd668319658a1a3c8ec76872ba6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000010" : {
+                        "balance" : "0x01"
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                    }
+                }
+            }
+        ],
+        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json
index 3f04aaf7c..014a6ac21 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json
@@ -1,5 +1,8 @@
 {
     "create2collisionStorage_d0g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has storage != 0"
+        },
         "blocks" : [
             {
                 "blockHeaderPremine" : {
@@ -59,7 +62,6 @@
                         "balance" : "0x00",
                         "nonce" : "0x01",
                         "storage" : {
-                            "0x00" : "0x01"
                         }
                     }
                 }
@@ -90,6 +92,14 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -97,6 +107,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json
new file mode 100644
index 000000000..553d7ec14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json
@@ -0,0 +1,124 @@
+{
+    "create2collisionStorage_d1g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has storage != 0"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x64600160015560005260006005601b6000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+                        "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "nonce" : "0x00",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0x00",
+                        "code" : "",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x01" : "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json
new file mode 100644
index 000000000..80e83b017
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json
@@ -0,0 +1,123 @@
+{
+    "create2collisionStorage_d2g0v0" : {
+        "_info" : {
+            "comment" : "create2 generates an account that already exists and has storage != 0"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+                        "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "0x00",
+                        "nonce" : "0x00",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    },
+                    "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0x00",
+                        "code" : "0x6001600155",
+                        "nonce" : "0x01",
+                        "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" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json
index ca9d7caeb..95908c5aa 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json
@@ -34,7 +34,7 @@
             },
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -52,6 +52,75 @@
                         "nonce" : "1"
                     }
                 }
+            },
+            {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "1",
+			"nonce" : "1",
+			"code" : "0x",
+			"storage" : {
+			    "0x01" : "1"
+			}
+                    },
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "1",
+                        "nonce" : "2"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : 2,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+		    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "1",
+			"nonce" : "1",
+			"code" : "0x6001600155",
+			"storage" : {}
+                    },
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "1",
+                        "nonce" : "2"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : 3,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+                    "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+                        "balance" : "2",
+			"nonce" : "1"
+                    },
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0",
+                        "nonce" : "2"
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
             }
         ],
         "pre" : {
@@ -68,11 +137,28 @@
                 "nonce" : "0",
                 "storage" : {
                 }
+            },
+	    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "1",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "1",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "{ (CREATE2 0 0 0 0) }"
+                "{ (CREATE2 0 0 0 0) }",
+		"{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+		"{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }",
+		"{ (CREATE2 1 0 0 0) }"
             ],
             "gasLimit" : [
                 "400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
index 3788046be..56976bfa3 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
@@ -44,7 +44,20 @@
                     "e2b35478fdd26477cc576dd906e6277761246a3c" : {
                         "balance" : "0",
 			"nonce" : "0",
-			"code" : "0x010203"
+			"code" : "0x010203",
+			"storage" : {}
+                    },
+		    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0",
+			"nonce" : "0",
+			"code" : "0x010203",
+			"storage" : {}
+                    },
+		    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0",
+			"nonce" : "0",
+			"code" : "0x010203",
+			"storage" : {}
                     },
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                         "balance" : "1",
@@ -71,11 +84,27 @@
                 "nonce" : "0",
                 "storage" : {
                 }
+            },
+	    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0",
+                "code" : "0x010203",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0",
+                "code" : "0x010203",
+                "nonce" : "0",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "{ (CREATE2 0 0 0 0) }"
+                "{ (CREATE2 0 0 0 0) }",
+		"{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+		"{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
             ],
             "gasLimit" : [
                 "400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json
index a1d553c97..3be5685f5 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json
@@ -42,7 +42,21 @@
                 "result" : {
                     "e2b35478fdd26477cc576dd906e6277761246a3c" : {
                         "balance" : "0",
-			"nonce" : "1"
+			"nonce" : "1",
+			"code" : "",
+			"storage" : {}
+                    },
+		    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0",
+			"nonce" : "1",
+			"code" : "",
+			"storage" : {}
+                    },
+		    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0",
+			"nonce" : "1",
+			"code" : "",
+			"storage" : {}
                     },
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                         "balance" : "1",
@@ -68,11 +82,27 @@
                 "nonce" : "1",
                 "storage" : {
                 }
+            },
+	    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
+            },
+	    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "1",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "{ (CREATE2 0 0 0 0) }"
+                "{ (CREATE2 0 0 0 0) }",
+		"{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+		"{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
             ],
             "gasLimit" : [
                 "400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json
index 1fb17c1ea..a92a87088 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json
@@ -36,7 +36,7 @@
             },
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -59,6 +59,58 @@
                         "nonce" : "1"
                     }
                 }
+            },
+            {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+                    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "shouldnotexist" : "1"
+                    },
+		    "0000000000000000000000000000000000000010" : {
+			"balance" : "0x01"
+		    },
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "1",
+                        "nonce" : "2",
+			"storage" : {
+			    "0x00" : "0x00"
+			}
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : 2,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+                    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "shouldnotexist" : "1"
+                    },
+		    "0000000000000000000000000000000000000010" : {
+			"balance" : "0x01"
+		    },
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "1",
+                        "nonce" : "2",
+			"storage" : {
+			    "0x00" : "0x00"
+			}
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
             }
         ],
         "pre" : {
@@ -75,11 +127,27 @@
                 "nonce" : "0",
                 "storage" : {
                 }
+            },
+	    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "1",
+                "code" : "{ (SELFDESTRUCT 0x10) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "1",
+                "code" : "{ (SELFDESTRUCT 0x10) }",
+                "nonce" : "0",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) }"
+                "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) }",
+		"{ (CALL 50000 0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01 0 0 0 0 0) (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+		"{ (CALL 50000 0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50 0 0 0 0 0) (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
             ],
             "gasLimit" : [
                 "400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json
index 9e6282453..1b92cafd4 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json
@@ -46,6 +46,14 @@
                         "balance" : "1",
 			"code" : "0x6010ff"
                     },
+		    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "1",
+			"code" : "0x6010ff"
+                    },
+		    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "1",
+			"code" : "0x6010ff"
+                    },
 		    "0000000000000000000000000000000000000010" : {
 			"shouldnotexist" : "1"
 		    },
@@ -72,11 +80,27 @@
                 "nonce" : "0",
                 "storage" : {
                 }
+            },
+	    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "1",
+                "code" : "{ (SELFDESTRUCT 0x10) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "1",
+                "code" : "{ (SELFDESTRUCT 0x10) }",
+                "nonce" : "0",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (SSTORE 0 0x112233)}"
+                "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (SSTORE 0 0x112233) }",
+		"{ (CALL 50000 0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01 0 0 0 0 0) (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) (SSTORE 0 0x112233)}",
+		"{ (CALL 50000 0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50 0 0 0 0 0) (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) (SSTORE 0 0x112233)}"
             ],
             "gasLimit" : [
                 "200000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json
index 817623aae..4aaa6b7e1 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json
@@ -46,6 +46,14 @@
                         "balance" : "1",
 			"code" : "0x6010ff"
                     },
+		    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "1",
+			"code" : "0x6010ff"
+                    },
+		    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "1",
+			"code" : "0x6010ff"
+                    },
 		    "0000000000000000000000000000000000000010" : {
 			"shouldnotexist" : "1"
 		    },
@@ -72,11 +80,27 @@
                 "nonce" : "0",
                 "storage" : {
                 }
+            },
+	    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "1",
+                "code" : "{ (SELFDESTRUCT 0x10) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "1",
+                "code" : "{ (SELFDESTRUCT 0x10) }",
+                "nonce" : "0",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (MSTORE 0 0x112233) (REVERT 0 10) }"
+                "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (MSTORE 0 0x112233) (REVERT 29 3) }",
+		"{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) (MSTORE 0 0x112233) (REVERT 29 3) }",
+		"{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) (MSTORE 0 0x112233) (REVERT 29 3) }"
             ],
             "gasLimit" : [
                 "400000"
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json
index 5a063bd77..502535838 100644
--- a/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json
@@ -37,7 +37,7 @@
             },
             {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : -1,
                     "value" : -1
                 },
@@ -47,7 +47,62 @@
                         "balance" : "0",
 			"nonce" : "1",
 			"storage" : {
-			    "0x00" : "0x01"
+			}
+                    },
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "1",
+                        "nonce" : "2",
+			"storage" : {
+			    "0x00" : "0x00"
+			}
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+                    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                        "balance" : "0",
+			"nonce" : "1",
+			"code" : "0x",
+			"storage" : {
+			    "0x01" : "0x01"
+			}
+                    },
+                    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "1",
+                        "nonce" : "2",
+			"storage" : {
+			    "0x00" : "0x00"
+			}
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "1"
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                    "data" : 2,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=Constantinople"],
+                "result" : {
+                    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                        "balance" : "0",
+			"nonce" : "1",
+			"code" : "0x6001600155",
+			"storage" : {
+			    "0x01" : "0x00"
 			}
                     },
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
@@ -78,11 +133,29 @@
                 "storage" : {
 		    "0x00" : "0x01"
                 }
+            },
+	    "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+		    "0x00" : "0x01"
+                }
+            },
+	    "ec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0",
+                "code" : "0x",
+                "nonce" : "0",
+                "storage" : {
+		    "0x00" : "0x01"
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "{ (CREATE2 0 0 0 0) }"
+                "{ (CREATE2 0 0 0 0) }",
+		"{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }",
+		"{ (MSTORE 0 0x6460016001556000526005601bf3) (CREATE2 0 18 14 0) }"
             ],
             "gasLimit" : [
                 "400000"