blockchain version of create failure due to deployment cost

16 files changed, 2530 insertions, 0 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g0v0.json
new file mode 100644
index 000000000..5d33beca8
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g0v0.json
@@ -0,0 +1,216 @@
+{
+    "CreateOOGafterInitCodeReturndata2_d0g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g0v0Filler.json",
+            "sourceHash" : "44327316311916cee59602fd044aef28cf9e9a7eb0e7916929ab4c0ebd6e0dbd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2f0",
+                    "hash" : "0xa68ecb8b5f5b716dfbe55310605538f49e3f1ebd6cc680a850a40afbf404528c",
+                    "mixHash" : "0x5106a80d21b3bbc8ef042cb24bd9143a8ed0fb53affffc4465e63995996c7a0e",
+                    "nonce" : "0xe542277a8f045b10",
+                    "number" : "0x01",
+                    "parentHash" : "0xd811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57",
+                    "receiptTrie" : "0xa0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003",
+                    "stateRoot" : "0x96ab863444b21cda708530d708638254079acefc3862b710a5182f5a61975f95",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0d811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096ab863444b21cda708530d708638254079acefc3862b710a5182f5a61975f95a0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0a0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2f08203e880a05106a80d21b3bbc8ef042cb24bd9143a8ed0fb53affffc4465e63995996c7a0e88e542277a8f045b10f861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x43ce2a744d1b64688d5d6d1de7b34bea00bc5831a25e0108d3f01a03a5e92821",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ce2a744d1b64688d5d6d1de7b34bea00bc5831a25e0108d3f01a03a5e92821a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa68ecb8b5f5b716dfbe55310605538f49e3f1ebd6cc680a850a40afbf404528c",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2f0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d10",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateOOGafterInitCodeReturndata2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g0v0Filler.json",
+            "sourceHash" : "44327316311916cee59602fd044aef28cf9e9a7eb0e7916929ab4c0ebd6e0dbd"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2f0",
+                    "hash" : "0x933064c91bc8ffe852bd1595dfc5a8ab39e92f77547a63dbe35dd241d938c1f7",
+                    "mixHash" : "0x7c73dde1212635a4a9e6279c4b9f9c5fc9546d1f6479fcd056e7033312ef0594",
+                    "nonce" : "0x4307a671a99ddb76",
+                    "number" : "0x01",
+                    "parentHash" : "0xd811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57",
+                    "receiptTrie" : "0xa0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003",
+                    "stateRoot" : "0x96ab863444b21cda708530d708638254079acefc3862b710a5182f5a61975f95",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0d811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa096ab863444b21cda708530d708638254079acefc3862b710a5182f5a61975f95a0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0a0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2f08203e880a07c73dde1212635a4a9e6279c4b9f9c5fc9546d1f6479fcd056e7033312ef0594884307a671a99ddb76f861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x43ce2a744d1b64688d5d6d1de7b34bea00bc5831a25e0108d3f01a03a5e92821",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ce2a744d1b64688d5d6d1de7b34bea00bc5831a25e0108d3f01a03a5e92821a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x933064c91bc8ffe852bd1595dfc5a8ab39e92f77547a63dbe35dd241d938c1f7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2f0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d10",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g1v0.json
new file mode 100644
index 000000000..ac38e6829
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g1v0.json
@@ -0,0 +1,232 @@
+{
+    "CreateOOGafterInitCodeReturndata2_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g1v0Filler.json",
+            "sourceHash" : "772a2305826367f0f3fb160beb89ebd9dae84b598e605a96fb47eef7af5cac59"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0134db",
+                    "hash" : "0xeebe0578a80bfdaa09e957f4725fca545b2d414cfd49738efa56b8fbdc0a67ca",
+                    "mixHash" : "0x1754fa33569569a07ec0e7daf82e44b60f10e1798b1536991c6d5e10222dfb32",
+                    "nonce" : "0x4d22ad236dc7a103",
+                    "number" : "0x01",
+                    "parentHash" : "0xd811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57",
+                    "receiptTrie" : "0xa897c7b85a801c7dcbb4d8792005babda34ba043d4f2c5842c2043a0ae8ce007",
+                    "stateRoot" : "0x80c061bed984a9ecd153da9c9e50aafc129df7acca718507b350dd474e2e5e11",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0d811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c061bed984a9ecd153da9c9e50aafc129df7acca718507b350dd474e2e5e11a00b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4a0a897c7b85a801c7dcbb4d8792005babda34ba043d4f2c5842c2043a0ae8ce007b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830134db8203e880a01754fa33569569a07ec0e7daf82e44b60f10e1798b1536991c6d5e10222dfb32884d22ad236dc7a103f862f86080018301731894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0f7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8a02c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x43ce2a744d1b64688d5d6d1de7b34bea00bc5831a25e0108d3f01a03a5e92821",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ce2a744d1b64688d5d6d1de7b34bea00bc5831a25e0108d3f01a03a5e92821a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xeebe0578a80bfdaa09e957f4725fca545b2d414cfd49738efa56b8fbdc0a67ca",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d34db",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3db25",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x02" : "0x6460016001556000526005601bf3"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateOOGafterInitCodeReturndata2_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g1v0Filler.json",
+            "sourceHash" : "772a2305826367f0f3fb160beb89ebd9dae84b598e605a96fb47eef7af5cac59"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0134db",
+                    "hash" : "0xbe9844f27df1e6eb102199cd9abe371af13bf21fb87d040d9a644c2a69adf7c3",
+                    "mixHash" : "0x416a324ac3aab47139c2f292b01bbfc1b11ee0f695fbd3d8f5bcc82fa775fcd2",
+                    "nonce" : "0xa270ba69f2ce6b5e",
+                    "number" : "0x01",
+                    "parentHash" : "0xd811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57",
+                    "receiptTrie" : "0xa897c7b85a801c7dcbb4d8792005babda34ba043d4f2c5842c2043a0ae8ce007",
+                    "stateRoot" : "0x80c061bed984a9ecd153da9c9e50aafc129df7acca718507b350dd474e2e5e11",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0d811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c061bed984a9ecd153da9c9e50aafc129df7acca718507b350dd474e2e5e11a00b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4a0a897c7b85a801c7dcbb4d8792005babda34ba043d4f2c5842c2043a0ae8ce007b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830134db8203e880a0416a324ac3aab47139c2f292b01bbfc1b11ee0f695fbd3d8f5bcc82fa775fcd288a270ba69f2ce6b5ef862f86080018301731894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0f7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8a02c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd811d9b4d3137cd6f7b6a43f401faa9380f51f39ca29580e5bc9174d4c605c57",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x43ce2a744d1b64688d5d6d1de7b34bea00bc5831a25e0108d3f01a03a5e92821",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ce2a744d1b64688d5d6d1de7b34bea00bc5831a25e0108d3f01a03a5e92821a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbe9844f27df1e6eb102199cd9abe371af13bf21fb87d040d9a644c2a69adf7c3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d34db",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3db25",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x02" : "0x6460016001556000526005601bf3"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g0v0.json
new file mode 100644
index 000000000..10120995f
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g0v0.json
@@ -0,0 +1,216 @@
+{
+    "CreateOOGafterInitCodeReturndata_d0g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g0v0Filler.json",
+            "sourceHash" : "00c766f209d03e996ee2a44270d3bdd1349b95690c25f2a6e5e89b4d109797f0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2f0",
+                    "hash" : "0x662bf7feb8dca95f95f63972087b8734b2d6203440ebf6a2683a5066c2fc9748",
+                    "mixHash" : "0x56ed45771121f2b3b06c98b342f91245881ba7c440d736e40000d027956d6926",
+                    "nonce" : "0x1583c2331c6b33d7",
+                    "number" : "0x01",
+                    "parentHash" : "0x86c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1",
+                    "receiptTrie" : "0xa0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003",
+                    "stateRoot" : "0x78aca808c1c28df952c4ecbc12403b27ab4265444338c51fb963d3d1d5dd1de3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a086c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078aca808c1c28df952c4ecbc12403b27ab4265444338c51fb963d3d1d5dd1de3a0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0a0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2f08203e880a056ed45771121f2b3b06c98b342f91245881ba7c440d736e40000d027956d6926881583c2331c6b33d7f861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x86c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9b92564257557b1857abf3c95c105e7adac05306f6fc69dc52ba1157e8659a9b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b92564257557b1857abf3c95c105e7adac05306f6fc69dc52ba1157e8659a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x662bf7feb8dca95f95f63972087b8734b2d6203440ebf6a2683a5066c2fc9748",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2f0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d10",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateOOGafterInitCodeReturndata_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g0v0Filler.json",
+            "sourceHash" : "00c766f209d03e996ee2a44270d3bdd1349b95690c25f2a6e5e89b4d109797f0"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2f0",
+                    "hash" : "0x606d47dbc91c80b5742519001b86193a1eb3fba384a3d81730b88a745580a7f8",
+                    "mixHash" : "0xfe8137b0865dfcd34e5c8bc69f55b6bdf5a176c0ad13564e7cc67156d8521aec",
+                    "nonce" : "0x2ae3705e5944c812",
+                    "number" : "0x01",
+                    "parentHash" : "0x86c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1",
+                    "receiptTrie" : "0xa0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003",
+                    "stateRoot" : "0x78aca808c1c28df952c4ecbc12403b27ab4265444338c51fb963d3d1d5dd1de3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a086c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078aca808c1c28df952c4ecbc12403b27ab4265444338c51fb963d3d1d5dd1de3a0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0a0012fbba7ac8349cb3a08fc9718afc72efcd07c28df76cdc294f15c233f5003b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2f08203e880a0fe8137b0865dfcd34e5c8bc69f55b6bdf5a176c0ad13564e7cc67156d8521aec882ae3705e5944c812f861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x86c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9b92564257557b1857abf3c95c105e7adac05306f6fc69dc52ba1157e8659a9b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b92564257557b1857abf3c95c105e7adac05306f6fc69dc52ba1157e8659a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x606d47dbc91c80b5742519001b86193a1eb3fba384a3d81730b88a745580a7f8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2f0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d10",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g1v0.json b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g1v0.json
new file mode 100644
index 000000000..f49eaf219
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g1v0.json
@@ -0,0 +1,216 @@
+{
+    "CreateOOGafterInitCodeReturndata_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g1v0Filler.json",
+            "sourceHash" : "276f674c61273e66b8848906d88f8516c53bb30361ef601970c7faf53d081d90"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x017318",
+                    "hash" : "0x88cb1429cc3a9086f0bb9b4b436f9da6e9ca08df8569198ca329fa3681772077",
+                    "mixHash" : "0x2f63f980a8df972419e6cdd158b668305756f96e4f54fce532c4ba2c5adfa3b5",
+                    "nonce" : "0x769a1ff2a3bf35b9",
+                    "number" : "0x01",
+                    "parentHash" : "0x86c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1",
+                    "receiptTrie" : "0x1bdcd930b7fdc5c12eb348343be4e7b6b5d1024f01ce0aa853862491e8095d8b",
+                    "stateRoot" : "0x64d26f031700d9e76e165979b8cbd59a9b01ef0cd02f94603776148c4c0e9095",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a086c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064d26f031700d9e76e165979b8cbd59a9b01ef0cd02f94603776148c4c0e9095a00b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4a01bdcd930b7fdc5c12eb348343be4e7b6b5d1024f01ce0aa853862491e8095d8bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173188203e880a02f63f980a8df972419e6cdd158b668305756f96e4f54fce532c4ba2c5adfa3b588769a1ff2a3bf35b9f862f86080018301731894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0f7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8a02c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x86c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9b92564257557b1857abf3c95c105e7adac05306f6fc69dc52ba1157e8659a9b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b92564257557b1857abf3c95c105e7adac05306f6fc69dc52ba1157e8659a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x88cb1429cc3a9086f0bb9b4b436f9da6e9ca08df8569198ca329fa3681772077",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d7318",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a39ce8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateOOGafterInitCodeReturndata_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g1v0Filler.json",
+            "sourceHash" : "276f674c61273e66b8848906d88f8516c53bb30361ef601970c7faf53d081d90"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x017318",
+                    "hash" : "0xd9de85af9a33001b14c009062d86b3b63cce92f0957277bc29a7a9b07dbca531",
+                    "mixHash" : "0x2f89e0ee3c1657bafa2ef937415971669e51beb05fc0f1e7e4dfec7c98764999",
+                    "nonce" : "0x6efbb413f9ce8810",
+                    "number" : "0x01",
+                    "parentHash" : "0x86c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1",
+                    "receiptTrie" : "0x1bdcd930b7fdc5c12eb348343be4e7b6b5d1024f01ce0aa853862491e8095d8b",
+                    "stateRoot" : "0x64d26f031700d9e76e165979b8cbd59a9b01ef0cd02f94603776148c4c0e9095",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a086c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064d26f031700d9e76e165979b8cbd59a9b01ef0cd02f94603776148c4c0e9095a00b1473e7c89a58aba867501ee4abd101e6c011850cd4ac489716505eb21e5db4a01bdcd930b7fdc5c12eb348343be4e7b6b5d1024f01ce0aa853862491e8095d8bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830173188203e880a02f89e0ee3c1657bafa2ef937415971669e51beb05fc0f1e7e4dfec7c98764999886efbb413f9ce8810f862f86080018301731894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0f7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8a02c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x86c5d57953c028cb769791f186ebf8238d5d58d88a9eb7dfc709d9e5794666d1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9b92564257557b1857abf3c95c105e7adac05306f6fc69dc52ba1157e8659a9b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09b92564257557b1857abf3c95c105e7adac05306f6fc69dc52ba1157e8659a9ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd9de85af9a33001b14c009062d86b3b63cce92f0957277bc29a7a9b07dbca531",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d7318",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a39ce8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert2_d0g0v0.json
new file mode 100644
index 000000000..961bcda59
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert2_d0g0v0.json
@@ -0,0 +1,246 @@
+{
+    "CreateOOGafterInitCodeRevert2_d0g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert2_d0g0v0Filler.json",
+            "sourceHash" : "5a0a9519e5e8e7f9fffe908ec0f134a5b37d2b3df0956506e819a0fa62a1b138"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0123e8",
+                    "hash" : "0x3e80f00ae4048a7e254247d7fa4a87ebd239c1863edb7a8bf6c74509114609fa",
+                    "mixHash" : "0xc298bff05421af80d014c59ad1085101bf070e6e3ceb0b346951b5d0a40326e3",
+                    "nonce" : "0xd937624d5ea967a0",
+                    "number" : "0x01",
+                    "parentHash" : "0x3f9661717f4e1fc15cff7ab1649b87bbe775081e91e9327cf82c87e78635e4ad",
+                    "receiptTrie" : "0xf0170814d15295dac3bf4bae80bf136849403f4ffdeb19a83e7a7120fa58f52d",
+                    "stateRoot" : "0x2f916a3d156cee030f1210bfc54ef78c33cb5588ca051420dd288951a9c51e99",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x89ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03f9661717f4e1fc15cff7ab1649b87bbe775081e91e9327cf82c87e78635e4ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f916a3d156cee030f1210bfc54ef78c33cb5588ca051420dd288951a9c51e99a089ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5fa0f0170814d15295dac3bf4bae80bf136849403f4ffdeb19a83e7a7120fa58f52db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830123e88203e880a0c298bff05421af80d014c59ad1085101bf070e6e3ceb0b346951b5d0a40326e388d937624d5ea967a0f862f8608001830124f894c94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0b524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0a0264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3f9661717f4e1fc15cff7ab1649b87bbe775081e91e9327cf82c87e78635e4ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb69616d524721d5ef93ad5545a8bf5a70826353ee3d549e0c81c16bf261710c0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b69616d524721d5ef93ad5545a8bf5a70826353ee3d549e0c81c16bf261710c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3e80f00ae4048a7e254247d7fa4a87ebd239c1863edb7a8bf6c74509114609fa",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d23e8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3ec18",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x6460016001556000526005601bf3"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateOOGafterInitCodeRevert2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert2_d0g0v0Filler.json",
+            "sourceHash" : "5a0a9519e5e8e7f9fffe908ec0f134a5b37d2b3df0956506e819a0fa62a1b138"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0123e8",
+                    "hash" : "0x13d74d7d0c79b745d24ac2d75986ece7d9a0d98d0c10ad603b81ad37e1935591",
+                    "mixHash" : "0x0b09c09bfafb322384820704c654d0efde2aa3eb135f53356f5531de7c1799ec",
+                    "nonce" : "0xdc56925bfb177378",
+                    "number" : "0x01",
+                    "parentHash" : "0x3f9661717f4e1fc15cff7ab1649b87bbe775081e91e9327cf82c87e78635e4ad",
+                    "receiptTrie" : "0xf0170814d15295dac3bf4bae80bf136849403f4ffdeb19a83e7a7120fa58f52d",
+                    "stateRoot" : "0x2f916a3d156cee030f1210bfc54ef78c33cb5588ca051420dd288951a9c51e99",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x89ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03f9661717f4e1fc15cff7ab1649b87bbe775081e91e9327cf82c87e78635e4ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f916a3d156cee030f1210bfc54ef78c33cb5588ca051420dd288951a9c51e99a089ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5fa0f0170814d15295dac3bf4bae80bf136849403f4ffdeb19a83e7a7120fa58f52db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830123e88203e880a00b09c09bfafb322384820704c654d0efde2aa3eb135f53356f5531de7c1799ec88dc56925bfb177378f862f8608001830124f894c94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0b524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0a0264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3f9661717f4e1fc15cff7ab1649b87bbe775081e91e9327cf82c87e78635e4ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb69616d524721d5ef93ad5545a8bf5a70826353ee3d549e0c81c16bf261710c0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b69616d524721d5ef93ad5545a8bf5a70826353ee3d549e0c81c16bf261710c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x13d74d7d0c79b745d24ac2d75986ece7d9a0d98d0c10ad603b81ad37e1935591",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d23e8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3ec18",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x6460016001556000526005601bf3"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert_d0g0v0.json
new file mode 100644
index 000000000..171031cf2
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert_d0g0v0.json
@@ -0,0 +1,246 @@
+{
+    "CreateOOGafterInitCodeRevert_d0g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert_d0g0v0Filler.json",
+            "sourceHash" : "2adcc0e162c61be520090d64a7874f267a47ce5c7606ebfb41cf4ca0284f0d88"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01241d",
+                    "hash" : "0x3568e5955799062ca020f0becefe058ec3f8d487f4f514a856600a99068f0ed1",
+                    "mixHash" : "0x8478d439b823fec08edb47448e172d37bee48d08004912c3a270e4241bf0bd6c",
+                    "nonce" : "0x5b8d949f0f5c2ccd",
+                    "number" : "0x01",
+                    "parentHash" : "0x40fce5bb5db3c35a18c34ba9bc4fd9a387426ea4b8b95a9cd57019db4d078cad",
+                    "receiptTrie" : "0xb5f4dc0bc3c234630c661412f6cdb9968d6ac6c4af1bac7019eae38a552036bf",
+                    "stateRoot" : "0xa7a496f95a1c7146c264407f9b1cce099c4166f0d09b215e566f44f5d1c82648",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x89ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a040fce5bb5db3c35a18c34ba9bc4fd9a387426ea4b8b95a9cd57019db4d078cada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7a496f95a1c7146c264407f9b1cce099c4166f0d09b215e566f44f5d1c82648a089ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5fa0b5f4dc0bc3c234630c661412f6cdb9968d6ac6c4af1bac7019eae38a552036bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301241d8203e880a08478d439b823fec08edb47448e172d37bee48d08004912c3a270e4241bf0bd6c885b8d949f0f5c2ccdf862f8608001830124f894c94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0b524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0a0264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x40fce5bb5db3c35a18c34ba9bc4fd9a387426ea4b8b95a9cd57019db4d078cad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0a6305235565e4638224d9e2e5aa6a407ca1595f008cdec7bf353dc0ad8b6265",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a6305235565e4638224d9e2e5aa6a407ca1595f008cdec7bf353dc0ad8b6265a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3568e5955799062ca020f0becefe058ec3f8d487f4f514a856600a99068f0ed1",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d241d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3ebe3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x6460016001556000526005601bf3"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateOOGafterInitCodeRevert_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert_d0g0v0Filler.json",
+            "sourceHash" : "2adcc0e162c61be520090d64a7874f267a47ce5c7606ebfb41cf4ca0284f0d88"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01241d",
+                    "hash" : "0xbbb4a3cf4eec63b23ff70f2d27bc4d2ce9d98bd116218df10cbcf451b7bcfb2c",
+                    "mixHash" : "0x899a03bf14287520b4c5a4a182a2131a35ed6d956095eb87eb83912d73573719",
+                    "nonce" : "0x701d00969cd40ca3",
+                    "number" : "0x01",
+                    "parentHash" : "0x40fce5bb5db3c35a18c34ba9bc4fd9a387426ea4b8b95a9cd57019db4d078cad",
+                    "receiptTrie" : "0xb5f4dc0bc3c234630c661412f6cdb9968d6ac6c4af1bac7019eae38a552036bf",
+                    "stateRoot" : "0xa7a496f95a1c7146c264407f9b1cce099c4166f0d09b215e566f44f5d1c82648",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x89ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a040fce5bb5db3c35a18c34ba9bc4fd9a387426ea4b8b95a9cd57019db4d078cada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7a496f95a1c7146c264407f9b1cce099c4166f0d09b215e566f44f5d1c82648a089ff2c528ea36a7d98b3b8689c69e5f33b60d27295c6e60e6a53e56219deba5fa0b5f4dc0bc3c234630c661412f6cdb9968d6ac6c4af1bac7019eae38a552036bfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301241d8203e880a0899a03bf14287520b4c5a4a182a2131a35ed6d956095eb87eb83912d7357371988701d00969cd40ca3f862f8608001830124f894c94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0b524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0a0264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x40fce5bb5db3c35a18c34ba9bc4fd9a387426ea4b8b95a9cd57019db4d078cad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0a6305235565e4638224d9e2e5aa6a407ca1595f008cdec7bf353dc0ad8b6265",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a6305235565e4638224d9e2e5aa6a407ca1595f008cdec7bf353dc0ad8b6265a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbbb4a3cf4eec63b23ff70f2d27bc4d2ce9d98bd116218df10cbcf451b7bcfb2c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62d241d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3ebe3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x6460016001556000526005601bf3"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g0v0.json
new file mode 100644
index 000000000..3457250e7
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g0v0.json
@@ -0,0 +1,216 @@
+{
+    "CreateOOGafterInitCode_d0g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g0v0Filler.json",
+            "sourceHash" : "41c41e0167502c82dad3762ae1bfdc721ddabe3bea76e8f4537a237b26a74730"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2e1",
+                    "hash" : "0x259695ea1f641013693d1fb32028195aeb0d2519793339e60e5b15c066432bd3",
+                    "mixHash" : "0xf723432b1169e84be79a073c423a30da6bb1daf412e7eac20de4c0929289582b",
+                    "nonce" : "0xb5404a6bf674037e",
+                    "number" : "0x01",
+                    "parentHash" : "0xfbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5",
+                    "receiptTrie" : "0x110b62833b86036581842d44edc4a99ad928c179ced08d46b0507706d26892dd",
+                    "stateRoot" : "0xdc2669706c618552d01b596534e46a8271fde43a6e7cfce59d4de6e919d3330a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0fbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc2669706c618552d01b596534e46a8271fde43a6e7cfce59d4de6e919d3330aa0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0110b62833b86036581842d44edc4a99ad928c179ced08d46b0507706d26892ddb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2e18203e880a0f723432b1169e84be79a073c423a30da6bb1daf412e7eac20de4c0929289582b88b5404a6bf674037ef861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xfbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16df1d7b7d01a0703ad2df59c442f7d8dd3db266c6026ec806386f71e40260a9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016df1d7b7d01a0703ad2df59c442f7d8dd3db266c6026ec806386f71e40260a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x259695ea1f641013693d1fb32028195aeb0d2519793339e60e5b15c066432bd3",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2e1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d1f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateOOGafterInitCode_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g0v0Filler.json",
+            "sourceHash" : "41c41e0167502c82dad3762ae1bfdc721ddabe3bea76e8f4537a237b26a74730"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd2e1",
+                    "hash" : "0x4c870c724e6aeef6bd91def711676861e58089fed80f444ce65ffc4a95230c39",
+                    "mixHash" : "0x6e0192a49ffb4f9f52ed5a158d920cff8a235f7a2f39d9561523f28e4029b36d",
+                    "nonce" : "0x196ce74a4bd8375a",
+                    "number" : "0x01",
+                    "parentHash" : "0xfbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5",
+                    "receiptTrie" : "0x110b62833b86036581842d44edc4a99ad928c179ced08d46b0507706d26892dd",
+                    "stateRoot" : "0xdc2669706c618552d01b596534e46a8271fde43a6e7cfce59d4de6e919d3330a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0fbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc2669706c618552d01b596534e46a8271fde43a6e7cfce59d4de6e919d3330aa0d1203c53b8c29493980e69a532ca755ba180085393bbfde48ba5c6ce648c08fca0110b62833b86036581842d44edc4a99ad928c179ced08d46b0507706d26892ddb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d2e18203e880a06e0192a49ffb4f9f52ed5a158d920cff8a235f7a2f39d9561523f28e4029b36d88196ce74a4bd8375af861f85f800182d2f094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba09f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdba02631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xfbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16df1d7b7d01a0703ad2df59c442f7d8dd3db266c6026ec806386f71e40260a9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016df1d7b7d01a0703ad2df59c442f7d8dd3db266c6026ec806386f71e40260a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4c870c724e6aeef6bd91def711676861e58089fed80f444ce65ffc4a95230c39",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd2e1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43d1f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g1v0.json b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g1v0.json
new file mode 100644
index 000000000..704d1aef1
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g1v0.json
@@ -0,0 +1,230 @@
+{
+    "CreateOOGafterInitCode_d0g1v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g1v0Filler.json",
+            "sourceHash" : "63afd9ff12a4f38ce5dacf84940a5163f971c4c1e1f0a1e56cab060061db3a92"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd317",
+                    "hash" : "0xed88c9c75e8ed198073e7f6e721fa5c1abeb1b338d7f4c40bd4810e85f007529",
+                    "mixHash" : "0xd155ce9f09427b86f4044822e95acc3a74c6d3821c3995af1614004b7527a0fe",
+                    "nonce" : "0x087d274b3f9ee5d9",
+                    "number" : "0x01",
+                    "parentHash" : "0xfbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5",
+                    "receiptTrie" : "0x0fed3078692e66a93136609d4a5476a81112122873950a2b0b2a1105221ccc45",
+                    "stateRoot" : "0x2cdb1048829fc1df3f4b4fc8b5eccecc28fdb30b65f9babdc30141cfac43b8ee",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7f2716334b77b355ef783bd0ce224487d5263ef2543943a70bf14fe9312ca1fe",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0fbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cdb1048829fc1df3f4b4fc8b5eccecc28fdb30b65f9babdc30141cfac43b8eea07f2716334b77b355ef783bd0ce224487d5263ef2543943a70bf14fe9312ca1fea00fed3078692e66a93136609d4a5476a81112122873950a2b0b2a1105221ccc45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3178203e880a0d155ce9f09427b86f4044822e95acc3a74c6d3821c3995af1614004b7527a0fe88087d274b3f9ee5d9f861f85f800182d6d894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca01ac3db0be170248eaae3abf06ff4580c0c841cd68d355341f97760e56c052ac4a023c43abdaef05f0c4758a428f523a194a32e5d75a50752057a302fc67c2cb100c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ac3db0be170248eaae3abf06ff4580c0c841cd68d355341f97760e56c052ac4",
+                        "s" : "0x23c43abdaef05f0c4758a428f523a194a32e5d75a50752057a302fc67c2cb100",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xfbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16df1d7b7d01a0703ad2df59c442f7d8dd3db266c6026ec806386f71e40260a9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016df1d7b7d01a0703ad2df59c442f7d8dd3db266c6026ec806386f71e40260a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xed88c9c75e8ed198073e7f6e721fa5c1abeb1b338d7f4c40bd4810e85f007529",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd317",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43ce9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateOOGafterInitCode_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.4.0.dev1-71+commit.d4c00a53.dirty",
+            "lllcversion" : "Version: 0.4.25-develop.2018.6.30+commit.e289c361.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g1v0Filler.json",
+            "sourceHash" : "63afd9ff12a4f38ce5dacf84940a5163f971c4c1e1f0a1e56cab060061db3a92"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd317",
+                    "hash" : "0xa90a563e3cd7f2555e8680aaa50514cbc612933d029e10da01e4e940774c2dc4",
+                    "mixHash" : "0xd63aad9149d91d3dba9c5bbf0874191543ca39afbf19f0b838ec7932e403cdf5",
+                    "nonce" : "0xe7d5dc0ae64bf3ff",
+                    "number" : "0x01",
+                    "parentHash" : "0xfbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5",
+                    "receiptTrie" : "0x0fed3078692e66a93136609d4a5476a81112122873950a2b0b2a1105221ccc45",
+                    "stateRoot" : "0x2cdb1048829fc1df3f4b4fc8b5eccecc28fdb30b65f9babdc30141cfac43b8ee",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7f2716334b77b355ef783bd0ce224487d5263ef2543943a70bf14fe9312ca1fe",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0fbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02cdb1048829fc1df3f4b4fc8b5eccecc28fdb30b65f9babdc30141cfac43b8eea07f2716334b77b355ef783bd0ce224487d5263ef2543943a70bf14fe9312ca1fea00fed3078692e66a93136609d4a5476a81112122873950a2b0b2a1105221ccc45b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d3178203e880a0d63aad9149d91d3dba9c5bbf0874191543ca39afbf19f0b838ec7932e403cdf588e7d5dc0ae64bf3fff861f85f800182d6d894b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca01ac3db0be170248eaae3abf06ff4580c0c841cd68d355341f97760e56c052ac4a023c43abdaef05f0c4758a428f523a194a32e5d75a50752057a302fc67c2cb100c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ac3db0be170248eaae3abf06ff4580c0c841cd68d355341f97760e56c052ac4",
+                        "s" : "0x23c43abdaef05f0c4758a428f523a194a32e5d75a50752057a302fc67c2cb100",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xfbfd3c0a699ca541028fff5dc80514acdbfa5c986176dc06391caa33645fa2b5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16df1d7b7d01a0703ad2df59c442f7d8dd3db266c6026ec806386f71e40260a9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016df1d7b7d01a0703ad2df59c442f7d8dd3db266c6026ec806386f71e40260a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa90a563e3cd7f2555e8680aaa50514cbc612933d029e10da01e4e940774c2dc4",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62cd317",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a43ce9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g0v0Filler.json
new file mode 100644
index 000000000..47e5fe2c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g0v0Filler.json
@@ -0,0 +1,86 @@
+{
+    "CreateOOGafterInitCodeReturndata2_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g1v0Filler.json
new file mode 100644
index 000000000..5cd49263f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata2_d0g1v0Filler.json
@@ -0,0 +1,90 @@
+{
+    "CreateOOGafterInitCodeReturndata2_d0g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x02" : "0x6460016001556000526005601bf3"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                        "code" : "0x6001600155"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x02" : "0x6460016001556000526005601bf3"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                        "code" : "0x6001600155"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556000600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g0v0Filler.json
new file mode 100644
index 000000000..74178b73b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g0v0Filler.json
@@ -0,0 +1,86 @@
+{
+    "CreateOOGafterInitCodeReturndata_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g1v0Filler.json
new file mode 100644
index 000000000..f3e06e934
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeReturndata_d0g1v0Filler.json
@@ -0,0 +1,86 @@
+{
+    "CreateOOGafterInitCodeReturndata_d0g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x017318",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7dca5ea253a0c2d8a7a0f0e7cffa6f69339635fe23a803315e7356ce51fa0f8",
+                        "s" : "0x2c694d350ee3e50c2ebaff4bb0e047722b09c46b837fd5dececbb3e22b5924a7",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0503d6001556020600060003e600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert2_d0g0v0Filler.json
new file mode 100644
index 000000000..0275eb4ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert2_d0g0v0Filler.json
@@ -0,0 +1,95 @@
+{
+    "CreateOOGafterInitCodeRevert2_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x6460016001556000526005601bf3"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x6460016001556000526005601bf3"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b6180e8f150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert_d0g0v0Filler.json
new file mode 100644
index 000000000..5b30bc66c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCodeRevert_d0g0v0Filler.json
@@ -0,0 +1,95 @@
+{
+    "CreateOOGafterInitCodeRevert_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0124f8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb524b286a1aaf2902aeec847abc1351ee6c3c1fa27d5405086807bdc855c85b0",
+                        "s" : "0x264d638cdeb8512a3cc8fc1261d3f292ebb19c727a08a6630ba6f570915dae33",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x6460016001556000526005601bf3"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x01" : "0x6460016001556000526005601bf3"
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f05060206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b5af150600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g0v0Filler.json
new file mode 100644
index 000000000..26e7a7d90
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g0v0Filler.json
@@ -0,0 +1,86 @@
+{
+    "CreateOOGafterInitCode_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f57d6181791523d1cd9e2eb90ea0ba38f8733010a628ed76873f339fe4eabdb",
+                        "s" : "0x2631234da766ed6f2d50f3960ede7ef162264794ebfeacdd49c7454192e6c809",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g1v0Filler.json
new file mode 100644
index 000000000..b0f598eb0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreateTest/CreateOOGafterInitCode_d0g1v0Filler.json
@@ -0,0 +1,88 @@
+{
+    "CreateOOGafterInitCode_d0g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0xd6d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ac3db0be170248eaae3abf06ff4580c0c841cd68d355341f97760e56c052ac4",
+                        "s" : "0x23c43abdaef05f0c4758a428f523a194a32e5d75a50752057a302fc67c2cb100",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                        "code" : "0x6001600155"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
+                        "code" : "0x6001600155"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6d6460016001556000526005601bf3600052600e60126000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file