Add a test for checking RETURNDATASIZE after a modexp with modsize = 1

5 files changed, 800 insertions, 152 deletions

diff --git a/BlockchainTests/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0.json b/BlockchainTests/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0.json
index 8feb9bedd..4dcb3c869 100644
--- a/BlockchainTests/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0.json
@@ -2,7 +2,7 @@
     "modexp_modsize0_returndatasize_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.a5d6e14b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
             "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0Filler.json",
             "sourceHash" : "a30b606f94f2efc61d4a03ac9964d42aa281183cfbd82dde4ae08d9080edd32d"
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x9284",
-                    "hash" : "0xde76c48b6d9ad26c73343f9a7961b06999ee2e506be06700857ac64795fc81c4",
-                    "mixHash" : "0x38caa2554c3a8406201a4923ec53c279dc58d831aef538bef0b0b601bd9800e5",
-                    "nonce" : "0xc45fc98fa6e954ed",
+                    "hash" : "0x080969d636dbb383110c2e5f0e4c887a6416593625d73b35faf3bc7bc2e18ecf",
+                    "mixHash" : "0x733663b839c93e5a700cc7d4afc37ece05e4f79d1acf50ca503dc4adb961a879",
+                    "nonce" : "0x4b08211c17fb2b91",
                     "number" : "0x01",
                     "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
                     "receiptTrie" : "0xbe0873c73f3450c8858a117d6390cea7e1caec17b1e742579d548623fbf00d77",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a317b55295de5cc9d93bad1cd365f88bf098660799f021acafa807c67cef8c90a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0be0873c73f3450c8858a117d6390cea7e1caec17b1e742579d548623fbf00d77b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008292848203e880a038caa2554c3a8406201a4923ec53c279dc58d831aef538bef0b0b601bd9800e588c45fc98fa6e954edf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c5f901f9a01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a317b55295de5cc9d93bad1cd365f88bf098660799f021acafa807c67cef8c90a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0be0873c73f3450c8858a117d6390cea7e1caec17b1e742579d548623fbf00d77b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008292848203e880a0733663b839c93e5a700cc7d4afc37ece05e4f79d1acf50ca503dc4adb961a879884b08211c17fb2b91f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde76c48b6d9ad26c73343f9a7961b06999ee2e506be06700857ac64795fc81c4",
+        "lastblockhash" : "0x080969d636dbb383110c2e5f0e4c887a6416593625d73b35faf3bc7bc2e18ecf",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -111,7 +111,7 @@
     "modexp_modsize0_returndatasize_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.a5d6e14b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
             "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0Filler.json",
             "sourceHash" : "a30b606f94f2efc61d4a03ac9964d42aa281183cfbd82dde4ae08d9080edd32d"
@@ -125,9 +125,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x9284",
-                    "hash" : "0xb170f624bee582bddc7bfd4aba5eafdeacd32259ab901dd3fad1bffe94752cdd",
-                    "mixHash" : "0x790f8734bc31a0ae19729defe9a3c267b2c8af9acf70425f713c50c6741de712",
-                    "nonce" : "0x2b12d4596a2c4cc7",
+                    "hash" : "0x0b1c01d9629a99571fc5bec168e5981914abaa586e3ca29abdb85e31eb5859b7",
+                    "mixHash" : "0xffa5a5fc21c3a611df22f5aedc221a147bd9c603812fddd0369f8f643762d2e5",
+                    "nonce" : "0x6732ac202d2ba2d3",
                     "number" : "0x01",
                     "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
                     "receiptTrie" : "0xbe0873c73f3450c8858a117d6390cea7e1caec17b1e742579d548623fbf00d77",
@@ -136,7 +136,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c5f901f9a01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a317b55295de5cc9d93bad1cd365f88bf098660799f021acafa807c67cef8c90a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0be0873c73f3450c8858a117d6390cea7e1caec17b1e742579d548623fbf00d77b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008292848203e880a0790f8734bc31a0ae19729defe9a3c267b2c8af9acf70425f713c50c6741de712882b12d4596a2c4cc7f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c5f901f9a01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a317b55295de5cc9d93bad1cd365f88bf098660799f021acafa807c67cef8c90a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a0be0873c73f3450c8858a117d6390cea7e1caec17b1e742579d548623fbf00d77b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008292848203e880a0ffa5a5fc21c3a611df22f5aedc221a147bd9c603812fddd0369f8f643762d2e5886732ac202d2ba2d3f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -173,7 +173,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb170f624bee582bddc7bfd4aba5eafdeacd32259ab901dd3fad1bffe94752cdd",
+        "lastblockhash" : "0x0b1c01d9629a99571fc5bec168e5981914abaa586e3ca29abdb85e31eb5859b7",
         "network" : "Constantinople",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -220,7 +220,7 @@
     "modexp_modsize0_returndatasize_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.a5d6e14b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
             "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0Filler.json",
             "sourceHash" : "a30b606f94f2efc61d4a03ac9964d42aa281183cfbd82dde4ae08d9080edd32d"
@@ -234,9 +234,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xe29f05753676d67dae6089e94e6e6387ed4f8e033333db22d21ce11cb39dd32c",
-                    "mixHash" : "0x3158c43e420b8a5c8b01b4272fdac8e8df72ddd48a6666877e77d5fbfc801975",
-                    "nonce" : "0xc71b4e305d4db0d0",
+                    "hash" : "0xafcdf1899fce95ba008242b1615dc9a668647aa70f40275be635ad30af84e7c7",
+                    "mixHash" : "0x573c2244a38f73533a54f676ba6e2bb6d24f367799ebe3ec0c04daa2aa82858e",
+                    "nonce" : "0x708646f2a6a2e357",
                     "number" : "0x01",
                     "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
                     "receiptTrie" : "0x55390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824",
@@ -245,7 +245,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a03158c43e420b8a5c8b01b4272fdac8e8df72ddd48a6666877e77d5fbfc80197588c71b4e305d4db0d0f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c7f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0573c2244a38f73533a54f676ba6e2bb6d24f367799ebe3ec0c04daa2aa82858e88708646f2a6a2e357f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -282,7 +282,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe29f05753676d67dae6089e94e6e6387ed4f8e033333db22d21ce11cb39dd32c",
+        "lastblockhash" : "0xafcdf1899fce95ba008242b1615dc9a668647aa70f40275be635ad30af84e7c7",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -329,7 +329,7 @@
     "modexp_modsize0_returndatasize_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.a5d6e14b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
             "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0Filler.json",
             "sourceHash" : "a30b606f94f2efc61d4a03ac9964d42aa281183cfbd82dde4ae08d9080edd32d"
@@ -343,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xc3e9618eca9e2d91a79119c76eec015b1e7f7160dcb140c0e3710ec93d962f93",
-                    "mixHash" : "0x185e7a37d974a7b7f2dcf33aede3c4acab517586361dec4aea195d39c08efc19",
-                    "nonce" : "0x8962926c917f7bbb",
+                    "hash" : "0x30d09ce089cf2a971695edf75142929336bae13d4077242b229d107e9a72df23",
+                    "mixHash" : "0x38335e1597cf35677b53b48f3df81e9cbf2350f6a876be99c37e278db4ca359e",
+                    "nonce" : "0x68c61bae21485fae",
                     "number" : "0x01",
                     "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
                     "receiptTrie" : "0x55390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824",
@@ -354,7 +354,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0185e7a37d974a7b7f2dcf33aede3c4acab517586361dec4aea195d39c08efc19888962926c917f7bbbf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c7f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a038335e1597cf35677b53b48f3df81e9cbf2350f6a876be99c37e278db4ca359e8868c61bae21485faef8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -391,7 +391,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc3e9618eca9e2d91a79119c76eec015b1e7f7160dcb140c0e3710ec93d962f93",
+        "lastblockhash" : "0x30d09ce089cf2a971695edf75142929336bae13d4077242b229d107e9a72df23",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -438,7 +438,7 @@
     "modexp_modsize0_returndatasize_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.a5d6e14b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
             "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0Filler.json",
             "sourceHash" : "a30b606f94f2efc61d4a03ac9964d42aa281183cfbd82dde4ae08d9080edd32d"
@@ -452,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x1f4a6945d8bc56347b82440ab935bc4780441511b9d10003c42fb96f0644d344",
-                    "mixHash" : "0x5d0be4acfd8a7d7916afec14434df858f6b1db628c9660243a491c0a64fb49e0",
-                    "nonce" : "0xac05155fdfc57199",
+                    "hash" : "0xf45048f45622a3bd2c1f3348d3c212593173f697559b62f47e3938dee00c0f86",
+                    "mixHash" : "0xf8a7406ba6a8af15d46dba269d496ae520ee51bf1123730c792d0be74d040c53",
+                    "nonce" : "0x3d56c8853e707ee0",
                     "number" : "0x01",
                     "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
                     "receiptTrie" : "0x55390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824",
@@ -463,7 +463,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a05d0be4acfd8a7d7916afec14434df858f6b1db628c9660243a491c0a64fb49e088ac05155fdfc57199f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c7f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0f8a7406ba6a8af15d46dba269d496ae520ee51bf1123730c792d0be74d040c53883d56c8853e707ee0f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -500,7 +500,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1f4a6945d8bc56347b82440ab935bc4780441511b9d10003c42fb96f0644d344",
+        "lastblockhash" : "0xf45048f45622a3bd2c1f3348d3c212593173f697559b62f47e3938dee00c0f86",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -547,7 +547,7 @@
     "modexp_modsize0_returndatasize_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.a5d6e14b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
             "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d0g0v0Filler.json",
             "sourceHash" : "a30b606f94f2efc61d4a03ac9964d42aa281183cfbd82dde4ae08d9080edd32d"
@@ -561,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0x919b65789bc81a2f21dbc6371c6984314a5d151a2b4d9a68b521f15b055888a9",
-                    "mixHash" : "0x5ba98c55a0d4fbee42fcc713e9f17776d32862fd059f13493867aad52eb76ffc",
-                    "nonce" : "0xaef9fb0b4bb2dd43",
+                    "hash" : "0xf62d1eca3cbf35df4bf3c8074068394f5b53f94db20cb2c973e5786e78b5a18b",
+                    "mixHash" : "0xfad9c6cdb4e30f6bbeabd31ccceb5e3027dcf386cf34dfba00a836c5a461c792",
+                    "nonce" : "0x33386884781ff92b",
                     "number" : "0x01",
                     "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
                     "receiptTrie" : "0x55390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824",
@@ -572,7 +572,7 @@
                     "transactionsTrie" : "0x15743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902c7f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a05ba98c55a0d4fbee42fcc713e9f17776d32862fd059f13493867aad52eb76ffc88aef9fb0b4bb2dd43f8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
+                "rlp" : "0xf902c7f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a015743da4b076cf53f3afa49acf4989fa4067fbd68b6d112f1300062bc995f7e3a055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0fad9c6cdb4e30f6bbeabd31ccceb5e3027dcf386cf34dfba00a836c5a461c7928833386884781ff92bf8c6f8c480018405f5e10094100000000000000000000000000000000000000080b86200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000001011ca083874b44aa69eb3dcbd314c7f023d3bbfa235b46b34df5fc3c66c011298c0b6ea032ee67eeb18b898823c6eab6fe091ed4bab424720c06419675b3b7b4582780a3c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
@@ -609,7 +609,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x919b65789bc81a2f21dbc6371c6984314a5d151a2b4d9a68b521f15b055888a9",
+        "lastblockhash" : "0xf62d1eca3cbf35df4bf3c8074068394f5b53f94db20cb2c973e5786e78b5a18b",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0.json b/BlockchainTests/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0.json
new file mode 100644
index 000000000..e2a9dd501
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0.json
@@ -0,0 +1,658 @@
+{
+    "modexp_modsize0_returndatasize_d1g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
+            "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json",
+            "sourceHash" : "96863a972e4c450b614f6a0c8c3e37c3af4c328ff59382b5d99ebf9c321a701e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xcda0",
+                    "hash" : "0x9d0a41b8631f9348d2a0eed7a599e7da0df2a049d8282e4b063f2b7f1a33e05f",
+                    "mixHash" : "0x11b920a4d0576deeb80bf6fac753805a5f2736c64c726370df22717304d74a65",
+                    "nonce" : "0x60d0f7b1ecc0b734",
+                    "number" : "0x01",
+                    "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+                    "receiptTrie" : "0x92325e524c4f992c675e75d11c0f82d805f30bc42ced05380efc3dc6a6ad10c6",
+                    "stateRoot" : "0xce9c16bd5f3937b2a3be006213a70e894f1288df5b5bcc029412689c9c1341e4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce9c16bd5f3937b2a3be006213a70e894f1288df5b5bcc029412689c9c1341e4a0cbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775fa092325e524c4f992c675e75d11c0f82d805f30bc42ced05380efc3dc6a6ad10c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082cda08203e880a011b920a4d0576deeb80bf6fac753805a5f2736c64c726370df22717304d74a658860d0f7b1ecc0b734f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101011ba0852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440a068221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440",
+                        "s" : "0x68221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9d0a41b8631f9348d2a0eed7a599e7da0df2a049d8282e4b063f2b7f1a33e05f",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x03" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62ccda0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3260",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_modsize0_returndatasize_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
+            "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json",
+            "sourceHash" : "96863a972e4c450b614f6a0c8c3e37c3af4c328ff59382b5d99ebf9c321a701e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xcda0",
+                    "hash" : "0x950a4606d3eb839b8887d1dd27649553ca03cc64f591ca851ebd421a4b8e0989",
+                    "mixHash" : "0x768c8d1fce323456b9d0c18c685c7977e2213a8e25bab60685322aa5e3d414cc",
+                    "nonce" : "0x78dafe6a412e37db",
+                    "number" : "0x01",
+                    "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+                    "receiptTrie" : "0x92325e524c4f992c675e75d11c0f82d805f30bc42ced05380efc3dc6a6ad10c6",
+                    "stateRoot" : "0xce9c16bd5f3937b2a3be006213a70e894f1288df5b5bcc029412689c9c1341e4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c6f901f9a01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce9c16bd5f3937b2a3be006213a70e894f1288df5b5bcc029412689c9c1341e4a0cbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775fa092325e524c4f992c675e75d11c0f82d805f30bc42ced05380efc3dc6a6ad10c6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082cda08203e880a0768c8d1fce323456b9d0c18c685c7977e2213a8e25bab60685322aa5e3d414cc8878dafe6a412e37dbf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101011ba0852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440a068221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440",
+                        "s" : "0x68221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x950a4606d3eb839b8887d1dd27649553ca03cc64f591ca851ebd421a4b8e0989",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x03" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62ccda0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f3260",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_modsize0_returndatasize_d1g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
+            "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json",
+            "sourceHash" : "96863a972e4c450b614f6a0c8c3e37c3af4c328ff59382b5d99ebf9c321a701e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x074c8e91265c472be91e8e695aa9eb80a6f8ea6037c0633136dea69a54c041fd",
+                    "mixHash" : "0x280d196442511e842cd06e1d4888a1afb748e39f0fa0ec9a5ab2dab8aab85999",
+                    "nonce" : "0x2266ec91833f6f6b",
+                    "number" : "0x01",
+                    "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+                    "receiptTrie" : "0x55390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824",
+                    "stateRoot" : "0xe9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a0cbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775fa055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0280d196442511e842cd06e1d4888a1afb748e39f0fa0ec9a5ab2dab8aab85999882266ec91833f6f6bf8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101011ba0852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440a068221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440",
+                        "s" : "0x68221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x074c8e91265c472be91e8e695aa9eb80a6f8ea6037c0633136dea69a54c041fd",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824ae9e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5d8aa1f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_modsize0_returndatasize_d1g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
+            "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json",
+            "sourceHash" : "96863a972e4c450b614f6a0c8c3e37c3af4c328ff59382b5d99ebf9c321a701e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x2ca7289127fbd0abe109a59a4ea3637c9f2857da37266f64f93da1e266f40b09",
+                    "mixHash" : "0x1b7e70091cb4afa1c90ac42ca8c5c8772491f0250ff69eba4d30162f6ccfd979",
+                    "nonce" : "0xa438c43e1555468d",
+                    "number" : "0x01",
+                    "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+                    "receiptTrie" : "0x55390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824",
+                    "stateRoot" : "0xe9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a0cbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775fa055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a01b7e70091cb4afa1c90ac42ca8c5c8772491f0250ff69eba4d30162f6ccfd97988a438c43e1555468df8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101011ba0852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440a068221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440",
+                        "s" : "0x68221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2ca7289127fbd0abe109a59a4ea3637c9f2857da37266f64f93da1e266f40b09",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824ae9e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5d8aa1f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_modsize0_returndatasize_d1g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
+            "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json",
+            "sourceHash" : "96863a972e4c450b614f6a0c8c3e37c3af4c328ff59382b5d99ebf9c321a701e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x81b3f6961c7c25b3a9aaa7ed8f4f6b93466991d46800bfa0d4652fbcbb2caa21",
+                    "mixHash" : "0x01f67bfa555a0441b01562b8d956f6c13e95948b54b7c90980f2a24f829bc52c",
+                    "nonce" : "0x56ebcdec830d3e13",
+                    "number" : "0x01",
+                    "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+                    "receiptTrie" : "0x55390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824",
+                    "stateRoot" : "0xe9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a0cbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775fa055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a001f67bfa555a0441b01562b8d956f6c13e95948b54b7c90980f2a24f829bc52c8856ebcdec830d3e13f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101011ba0852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440a068221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440",
+                        "s" : "0x68221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x81b3f6961c7c25b3a9aaa7ed8f4f6b93466991d46800bfa0d4652fbcbb2caa21",
+        "network" : "Frontier",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824ae9e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5d8aa1f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_modsize0_returndatasize_d1g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
+            "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json",
+            "sourceHash" : "96863a972e4c450b614f6a0c8c3e37c3af4c328ff59382b5d99ebf9c321a701e"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0xcd5a30088da87b7b041db7d5768e5e1079b0e443b0df2b7cf0b31b7f6bb0e128",
+                    "mixHash" : "0xefb463ea8e802478540fce8ce646d34ed9048f495271c434ac1bf890b11eeda3",
+                    "nonce" : "0x556e0e22b7d0a206",
+                    "number" : "0x01",
+                    "parentHash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+                    "receiptTrie" : "0x55390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824",
+                    "stateRoot" : "0xe9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902c8f901fba01c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9f23597eba3837f742ce3cb12ad5b744de082fc71062f32eb3ded0f61552070a0cbfc6316123d9ae28b4fc116b19f8238ad347926da6ab14992ba97a6a1c9775fa055390f1f0cb7655009a8be8b943f7f23ed438c304d55fe1fb843ef74b0de8824b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0efb463ea8e802478540fce8ce646d34ed9048f495271c434ac1bf890b11eeda388556e0e22b7d0a206f8c7f8c580018405f5e10094100000000000000000000000000000000000000080b8630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101011ba0852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440a068221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440",
+                        "s" : "0x68221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x1c8f12490efac16e18c7b1a366deb8a91b1c20fa25a215f4acd9400ad66068b0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a8c4b490471ee119287a6f1956c35355aa08605ff7e9b12af5c0a6feb51d1963a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcd5a30088da87b7b041db7d5768e5e1079b0e443b0df2b7cf0b31b7f6bb0e128",
+        "network" : "Homestead",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824ae9e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5d8aa1f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize.json b/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize.json
index 9483ec013..a900c485f 100644
--- a/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize.json
+++ b/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize.json
@@ -2,10 +2,10 @@
     "modexp_modsize0_returndatasize" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.a5d6e14b.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.70d23560.Linux.g++",
             "lllcversion" : "Version: 0.4.19-develop.2017.10.19+commit.4e7d1440.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json",
-            "sourceHash" : "c7322e90ec087f2997c7f48d728367470f032ce532ecc8b7b1c2d6f01609f375"
+            "sourceHash" : "155b572dfddef193e70089c11dd46869e8db13e58837b7da7bfeac2813e40898"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -27,28 +27,10 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0xc2d762d9e389d5934c467c93bea25e58f046320d32de2d8a0fdd24c9e2f680c4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0xc2d762d9e389d5934c467c93bea25e58f046320d32de2d8a0fdd24c9e2f680c4",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0xc2d762d9e389d5934c467c93bea25e58f046320d32de2d8a0fdd24c9e2f680c4",
+                    "hash" : "0x4f516d60cc93deeddf704483a278920e2cd3a41ba963306fddad9826009e0c8c",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -65,28 +47,10 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x9a8dd36fe97d42e39efac42970f397a0e4383b7ab973e9269ba30c603d4dcd4a",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x7610515b047151df5635a272653b7a75c2913221a719b0e2817a6b1e1b927ed1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x8f77887ab8e98dde1bdbe7edabe0816a960a5a1bcce5f07a992f45a7ba73e0f5",
+                    "hash" : "0x3b83e328f824dc9db7d2649cff21de3e91d78022722d2218d67161be0fd6328b",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -103,28 +67,10 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x9a8dd36fe97d42e39efac42970f397a0e4383b7ab973e9269ba30c603d4dcd4a",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x7610515b047151df5635a272653b7a75c2913221a719b0e2817a6b1e1b927ed1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x8f77887ab8e98dde1bdbe7edabe0816a960a5a1bcce5f07a992f45a7ba73e0f5",
+                    "hash" : "0x3b83e328f824dc9db7d2649cff21de3e91d78022722d2218d67161be0fd6328b",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -141,28 +87,10 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x9a8dd36fe97d42e39efac42970f397a0e4383b7ab973e9269ba30c603d4dcd4a",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x7610515b047151df5635a272653b7a75c2913221a719b0e2817a6b1e1b927ed1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x8f77887ab8e98dde1bdbe7edabe0816a960a5a1bcce5f07a992f45a7ba73e0f5",
+                    "hash" : "0x3b83e328f824dc9db7d2649cff21de3e91d78022722d2218d67161be0fd6328b",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -179,28 +107,10 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
                 {
-                    "hash" : "0x9a8dd36fe97d42e39efac42970f397a0e4383b7ab973e9269ba30c603d4dcd4a",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x7610515b047151df5635a272653b7a75c2913221a719b0e2817a6b1e1b927ed1",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "hash" : "0x8f77887ab8e98dde1bdbe7edabe0816a960a5a1bcce5f07a992f45a7ba73e0f5",
+                    "hash" : "0x3b83e328f824dc9db7d2649cff21de3e91d78022722d2218d67161be0fd6328b",
                     "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
+                        "data" : 1,
+                        "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
@@ -226,13 +136,11 @@
         },
         "transaction" : {
             "data" : [
-                "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101"
+                "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+                "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101"
             ],
             "gasLimit" : [
-                "0x05f5e100",
-                "0x015f90",
-                "0x01adb0",
-                "0x030d40"
+                "0x05f5e100"
             ],
             "gasPrice" : "0x01",
             "nonce" : "0x00",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json
new file mode 100644
index 000000000..f6e6a208e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/modexp_modsize0_returndatasize_d1g0v0Filler.json
@@ -0,0 +1,63 @@
+{
+    "modexp_modsize0_returndatasize_d1g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x02540be400",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x852c39d2980a17822a2891ad7e5caacf3a60c3eba4f6c1bc9068981a52253440",
+                        "s" : "0x68221ea80724c2084f96a2e4b2f00a9a9fb869c5b38516457868739aff630875",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e8516002553d600355",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x03" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json
index e58061a16..ae477b273 100644
--- a/src/GeneralStateTestsFiller/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/modexp_modsize0_returndatasizeFiller.json
@@ -28,7 +28,7 @@
             },
 	    {
                 "indexes" : {
-                    "data" : -1,
+                    "data" : 0,
                     "gas" : 0,
                     "value" : -1
                 },
@@ -42,6 +42,23 @@
                         }
                     }
                 }
+        },
+	    {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+			    "0x01" : "0x01",
+                            "0x02" : "0x00",
+			    "0x03" : "0x01"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
@@ -63,13 +80,15 @@
         },
         "transaction" : {
 	    "// data" : [
-		"modlength zero"
+			"modlength zero",
+			"modlength one"
 	    ],
             "data" : [
-"0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101"
+				"0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000101",
+				"0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001010101"
             ],
             "gasLimit" : [
-                "100000000", "90000", "110000", "200000"
+                "100000000"
             ],
             "gasPrice" : "1",
             "nonce" : "0",